commit 4cdd6a61d01ae6d7c755e870acd8a7eb139d22e7 Merge: 208b49c b366bb4 Author: Philipp Winter phw@nymity.ch Date: Wed Apr 15 09:34:59 2020 -0700

Merge branch 'defect/17548' into develop

.gnupg/TESTING.pub | Bin 4622 -> 0 bytes .gnupg/TESTING.subkeys.sec | Bin 7212 -> 0 bytes .gnupg/bridgedb-offline-key.pub.asc | 113 ---------- .gnupg/bridgedb-online-key.pub.asc | 100 --------- .gnupg/gpg.conf | 96 --------- .gnupg/pubring.gpg | Bin 4634 -> 0 bytes .gnupg/secring.gpg | Bin 7224 -> 0 bytes .travis.requirements.txt | 1 - CHANGELOG | 6 + README.rst | 29 +-- bridgedb.conf | 45 ---- bridgedb/configure.py | 3 +- bridgedb/crypto.py | 99 +-------- bridgedb/distributors/email/autoresponder.py | 41 +--- bridgedb/distributors/email/distributor.py | 6 +- bridgedb/distributors/email/request.py | 22 -- bridgedb/distributors/email/server.py | 10 - bridgedb/distributors/email/templates.py | 7 - bridgedb/distributors/https/server.py | 2 - bridgedb/distributors/https/templates/base.html | 2 - bridgedb/i18n/templates/bridgedb.pot | 84 ++++---- bridgedb/strings.py | 268 +----------------------- bridgedb/test/email_helpers.py | 23 +- bridgedb/test/test_crypto.py | 137 ------------ bridgedb/test/test_email_autoresponder.py | 15 -- bridgedb/test/test_email_request.py | 36 +--- bridgedb/test/test_email_templates.py | 11 - bridgedb/test/test_main.py | 5 - requirements.txt | 1 - scripts/setup-tests | 2 +- 30 files changed, 63 insertions(+), 1101 deletions(-)