commit b95d400ff0293cf6de9fe9c2fa7a2dd78f1ee809 Merge: 74cdb09 be93cb7 Author: Isis Lovecruft isis@torproject.org Date: Tue Aug 12 03:23:36 2014 +0000

Merge branch 'fix/9874-https' into develop

.test.requirements.txt | 3 +- .travis.requirements.txt | 24 +++++ .travis.yml | 19 ++-- lib/bridgedb/test/test_bridgedb.py | 167 ++++++++++++++------------------- lib/bridgedb/test/test_https.py | 179 ++++++++++++++++++++++++++++++++++++ lib/bridgedb/test/util.py | 22 +++++ setup.py | 2 +- 7 files changed, 306 insertions(+), 110 deletions(-)