commit f279fa084f19a56bf5fce9a8a575e16c8abe9dad
Merge: 978f9be efff3eb
Author: Philipp Winter <p...@nymity.ch>
Date: Tue Jun 4 09:34:12 2019 -0700
Merge branch 'bug28655' into develop
.test.requirements.txt | 2 +-
.travis.requirements.txt | 2 +-
CHANGELOG | 8 ++++++
bridgedb.conf | 8 ++++++
bridgedb/bridgerequest.py | 7 +++++
bridgedb/bridges.py | 21 +++++++++++++++
bridgedb/filters.py | 34 ++++++++++++++++++++++++
bridgedb/main.py | 8 ++++++
bridgedb/runner.py | 2 +-
bridgedb/test/test_distributors_moat_request.py | 3 ++-
bridgedb/test/test_filters.py | 35 +++++++++++++++++++++++++
bridgedb/test/test_https_distributor.py | 31 ++++++++++++++++++++++
bridgedb/test/test_main.py | 1 +
bridgedb/test/util.py | 17 +++++++++++-
doc/HACKING.md | 2 +-
scripts/setup-tests | 2 +-
16 files changed, 176 insertions(+), 7 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
