commit 3a11cf4110d49018eacee7ed3bff32d6e3866c58 Merge: a36e627 f46e16b Author: Isis Lovecruft <isis@torproject.org> Date: Wed Feb 11 00:43:33 2015 +0000 Merge branch 'hotfix/0.2.4-travis-pyeggcache' into develop .travis.yml | 1 + 1 file changed, 1 insertion(+)