commit c3a820daeffa1acc02b9c0458ba8495ff387ecd4 Merge: 7b142b8 1f61489 Author: Philipp Winter phw@nymity.ch Date: Wed Feb 19 10:08:03 2020 -0800
Merge branch 'defect/30946' into develop
.travis.requirements.txt | 3 +- .travis.yml | 2 +- CHANGELOG | 4 + MANIFEST.in | 2 +- bridgedb/Bridges.py | 21 ++--- bridgedb/Stability.py | 38 ++++---- bridgedb/Storage.py | 22 +++-- bridgedb/bridgerequest.py | 2 +- bridgedb/bridges.py | 16 ++-- bridgedb/captcha.py | 29 +++--- bridgedb/configure.py | 2 +- bridgedb/crypto.py | 45 ++++------ bridgedb/distribute.py | 4 +- bridgedb/distributors/email/__init__.py | 6 -- bridgedb/distributors/email/autoresponder.py | 58 ++++++------ bridgedb/distributors/email/dkim.py | 6 +- bridgedb/distributors/email/server.py | 39 ++++----- bridgedb/distributors/email/templates.py | 1 + bridgedb/distributors/https/distributor.py | 5 +- bridgedb/distributors/https/server.py | 111 +++++++++++++++-------- bridgedb/distributors/moat/server.py | 24 ++--- bridgedb/filters.py | 5 +- bridgedb/main.py | 6 +- bridgedb/metrics.py | 12 +-- bridgedb/parse/addr.py | 13 +-- bridgedb/parse/descriptors.py | 42 +-------- bridgedb/parse/headers.py | 7 +- bridgedb/parse/nickname.py | 2 +- bridgedb/parse/options.py | 6 +- bridgedb/persistent.py | 15 ++-- bridgedb/proxy.py | 20 ++--- bridgedb/qrcodes.py | 10 +-- bridgedb/schedule.py | 9 +- bridgedb/test/deprecated.py | 2 +- bridgedb/test/email_helpers.py | 10 +-- bridgedb/test/https_helpers.py | 6 +- bridgedb/test/legacy_Tests.py | 36 ++++---- bridgedb/test/moat_helpers.py | 6 +- bridgedb/test/test_Bridges.py | 10 +-- bridgedb/test/test_Storage.py | 2 +- bridgedb/test/test_bridgerequest.py | 4 +- bridgedb/test/test_bridges.py | 76 ++++++++-------- bridgedb/test/test_captcha.py | 28 +++--- bridgedb/test/test_crypto.py | 17 ++-- bridgedb/test/test_distributors_moat_request.py | 2 +- bridgedb/test/test_distributors_moat_server.py | 8 +- bridgedb/test/test_email_autoresponder.py | 8 +- bridgedb/test/test_email_distributor.py | 8 +- bridgedb/test/test_email_dkim.py | 8 +- bridgedb/test/test_email_server.py | 39 +++++---- bridgedb/test/test_email_templates.py | 2 +- bridgedb/test/test_geo.py | 4 +- bridgedb/test/test_https.py | 18 ++-- bridgedb/test/test_https_distributor.py | 10 +-- bridgedb/test/test_https_request.py | 2 +- bridgedb/test/test_https_server.py | 102 ++++++++++++--------- bridgedb/test/test_main.py | 4 +- bridgedb/test/test_metrics.py | 4 +- bridgedb/test/test_parse_addr.py | 14 +-- bridgedb/test/test_parse_descriptors.py | 112 ++++++++++++------------ bridgedb/test/test_persistent.py | 18 ++-- bridgedb/test/test_persistentSaveAndLoad.py | 21 +++-- bridgedb/test/test_proxy.py | 18 ++-- bridgedb/test/test_schedule.py | 2 +- bridgedb/test/test_smtp.py | 18 ++-- bridgedb/test/test_translations.py | 18 ++-- bridgedb/test/test_txrecaptcha.py | 13 +-- bridgedb/test/test_util.py | 2 +- bridgedb/test/util.py | 8 +- bridgedb/translations.py | 21 +++-- bridgedb/txrecaptcha.py | 31 +++---- bridgedb/util.py | 23 +++-- requirements.txt | 3 +- scripts/bridgedb | 2 +- scripts/create_descriptors | 22 ++--- scripts/get-tor-exits | 41 +++------ setup.py | 2 +- 77 files changed, 693 insertions(+), 699 deletions(-)