A Common Generalization of Topological and Measure-Theoretic Entropy