commit 3972bfac81b2e2959e39e3e6ad7acb2f9044d2cb Merge: 6bc04ac 24acf6a Author: Isis Lovecruft <isis@torproject.org> Date: Sun Dec 28 14:10:04 2014 +0000 Merge branch 'hotfix/0.2.3-travis-mechanize-http' into develop .travis.yml | 5 +++ lib/bridgedb/test/test_https.py | 78 +++++++++++++++++++++++++++------------ 2 files changed, 60 insertions(+), 23 deletions(-)