commit 0a94b05c376aa4f62f97edd6f7cdfa09db797b83 Merge: 273cd76 034a421 Author: Isis Lovecruft isis@torproject.org Date: Wed Feb 18 21:38:57 2015 +0000

Merge branch 'develop' into fix/9380-stem_r10

lib/bridgedb/test/test_https.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)