commit a8451767b1327118122ba68a803520fbf5e71927 Merge: 7de653e 9635ec7 Author: Isis Lovecruft <isis@torproject.org> Date: Wed Mar 18 00:20:50 2015 +0000 Merge branch 'hotfix/0.2.4-14797-requirements' into develop .travis.requirements.txt | 4 ++-- requirements.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)