[tor-commits] [bridgedb/master] Merge branch 'release/0.3.6'

Thu Jul 28 16:41:12 UTC 2016

commit 908294fde8cb818de29f73e8355411148dfba8f9
Merge: 7d6defe 936958a
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Jul 28 16:38:07 2016 +0000

    Merge branch 'release/0.3.6'

 .travis.yml               |  12 +--
 CHANGELOG                 |  17 +++-
 bridgedb.conf             |   2 +
 bridgedb/Main.py          |  12 +++
 bridgedb/runner.py        |  29 ++++++
 bridgedb/util.py          |  21 +++++
 requirements.txt          |   2 +-
 test/https_helpers.py     | 228 +++++++++++++++++++++++++++++++++++++++++++++-
 test/test_https_server.py |   2 +-
 test/test_txrecaptcha.py  |   6 ++
 test/test_util.py         |  33 ++++++-
 11 files changed, 352 insertions(+), 12 deletions(-)