commit f18ba06ffc7ff8031b3c074b4c4e656fbe0a9773 Merge: 3536724 be93cb7 Author: Isis Lovecruft <isis@torproject.org> Date: Fri Aug 8 03:12:59 2014 +0000 Merge branch 'fix/9874-https' into fix/9874-email lib/bridgedb/test/test_https.py | 217 +++++++++++++++++++++------------------ 1 file changed, 115 insertions(+), 102 deletions(-)