commit 9bb5de6b07d33bef6ca7db22a70398018523b6e4 Merge: 659b4ed 6aaa2ed Author: Isis Lovecruft isis@torproject.org Date: Wed Dec 13 20:12:08 2017 +0000

Merge branch 'release/0.6.1'

CHANGELOG | 53 +++++ README.rst | 97 ++++----- bridgedb.conf | 6 - bridgedb/Bridges.py | 18 +- bridgedb/Bucket.py | 288 ------------------------- bridgedb/bridgerequest.py | 2 +- bridgedb/distributors/https/server.py | 6 +- bridgedb/distributors/moat/server.py | 2 +- bridgedb/main.py | 51 ++--- bridgedb/parse/options.py | 29 ++- bridgedb/runner.py | 14 -- bridgedb/test/test_Bucket.py | 63 ------ bridgedb/test/test_bridgedb_script.py | 19 -- bridgedb/test/test_distributors_moat_server.py | 2 +- bridgedb/test/test_https_server.py | 14 ++ bridgedb/test/test_main.py | 26 +-- doc/sphinx/source/bridgedb.Bucket.rst | 8 - doc/sphinx/source/bridgedb.rst | 1 - doc/sphinx/source/conf.py | 1 - scripts/test-moat | 56 +++++ 20 files changed, 208 insertions(+), 548 deletions(-)