[tor-commits] [bridgedb/master] Merge branch 'fix/9874-https' into develop

[isis at torproject.org]

commit 25e092708ca0a50399cbd06d67c63cf46f145d3d
Merge: f5360f5 2e14f04
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Aug 27 05:46:45 2014 +0000

    Merge branch 'fix/9874-https' into develop

 lib/bridgedb/test/test_https.py |   27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)