commit 2c9ef89e6778b3c37bb2140ab4e111ed0c587186 Merge: 5a95076 cbc3e2d Author: Isis Lovecruft isis@torproject.org Date: Tue Feb 10 22:50:22 2015 +0000

Merge branch 'hotfix/0.2.4-travis-pyeggcache' into develop

.travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+)