commit 321020ef0fcbb1507a3a0f38fed4b13267dff586 Merge: b15e76b 4d302bd Author: Isis Lovecruft isis@torproject.org Date: Thu Aug 7 12:10:44 2014 +0000

Merge branch 'fix/9874-https' into fix/9874-email

.test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)