commit c45439ceb3a8dd43c658607606fb4a7aad57fd67 Merge: 2ccf7ef 64c29be Author: Philipp Winter phw@nymity.ch Date: Wed May 27 10:05:59 2020 -0700

Merge branch 'release-0.10.1'

.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 .test.requirements.txt | 4 +- .travis.requirements.txt | 19 +- CHANGELOG | 2427 ++++++++++---------- README.rst | 39 +- bridgedb.conf | 45 - bridgedb/Storage.py | 71 +- bridgedb/{Bridges.py => bridgerings.py} | 4 +- bridgedb/bridges.py | 4 +- bridgedb/configure.py | 3 +- bridgedb/crypto.py | 99 +- bridgedb/distributors/email/autoresponder.py | 51 +- bridgedb/distributors/email/distributor.py | 18 +- bridgedb/distributors/email/request.py | 42 +- bridgedb/distributors/email/server.py | 12 +- bridgedb/distributors/email/templates.py | 133 +- bridgedb/distributors/https/distributor.py | 11 +- bridgedb/distributors/https/request.py | 5 +- bridgedb/distributors/https/server.py | 13 +- .../https/templates/assets/css/main.css | 4 +- bridgedb/distributors/https/templates/base.html | 2 - bridgedb/distributors/https/templates/bridges.html | 13 +- .../distributors/https/templates/error-400.html | 30 + .../distributors/https/templates/error-500.html | 4 +- bridgedb/distributors/moat/distributor.py | 5 +- bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 367 +-- bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/be/LC_MESSAGES/bridgedb.po | 361 +-- bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po | 358 +-- bridgedb/i18n/bs/LC_MESSAGES/bridgedb.po | 399 ++++ bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 398 ++-- bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 360 +-- bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 399 ++-- bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 360 +-- bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 360 +-- bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 358 +-- bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 +-- bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 360 +-- bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po | 359 +-- bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/et/LC_MESSAGES/bridgedb.po | 359 +-- bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 427 +++- bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 373 +-- bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 358 +-- bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 363 +-- bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po | 358 +-- bridgedb/i18n/gd/LC_MESSAGES/bridgedb.po | 399 ++++ bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/gu/LC_MESSAGES/bridgedb.po | 399 ++++ bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 366 +-- bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po | 401 ++-- bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 361 +-- bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 366 +-- bridgedb/i18n/is/LC_MESSAGES/bridgedb.po | 358 +-- bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 362 +-- bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 380 +-- bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po | 357 +-- bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po | 358 +-- bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 513 +++-- bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 361 +-- bridgedb/i18n/lt/LC_MESSAGES/bridgedb.po | 406 ++++ bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 357 +-- bridgedb/i18n/ml/LC_MESSAGES/bridgedb.po | 404 ++++ bridgedb/i18n/mr/LC_MESSAGES/bridgedb.po | 400 ++++ bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 366 +-- bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 395 ++-- bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/pa/LC_MESSAGES/bridgedb.po | 402 ++++ bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 359 +-- bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 363 +-- bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po | 371 +-- bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 358 +-- bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 393 ++-- bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 357 +-- bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 378 +-- bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po | 357 +-- bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 370 +-- bridgedb/i18n/sw/LC_MESSAGES/bridgedb.po | 399 ++++ bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 +-- bridgedb/i18n/templates/bridgedb.pot | 157 +- bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 436 +++- bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 361 +-- bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/ur/LC_MESSAGES/bridgedb.po | 399 ++++ bridgedb/i18n/uz/LC_MESSAGES/bridgedb.po | 401 ++++ bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po | 389 ++-- bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 363 +-- bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po | 356 +-- bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 358 +-- bridgedb/main.py | 18 +- bridgedb/metrics.py | 7 +- bridgedb/persistent.py | 11 +- bridgedb/strings.py | 313 +-- bridgedb/test/deprecated.py | 4 +- bridgedb/test/email_helpers.py | 23 +- bridgedb/test/legacy_Tests.py | 12 +- bridgedb/test/test_Tests.py | 10 +- bridgedb/test/test_bridgedb_script.py | 2 + .../test/{test_Bridges.py => test_bridgerings.py} | 22 +- bridgedb/test/test_bridges.py | 12 +- bridgedb/test/test_crypto.py | 137 -- bridgedb/test/test_email_autoresponder.py | 20 +- bridgedb/test/test_email_request.py | 74 +- bridgedb/test/test_email_templates.py | 52 +- bridgedb/test/test_https_distributor.py | 4 +- bridgedb/test/test_https_server.py | 20 +- bridgedb/test/test_main.py | 5 - bridgedb/test/util.py | 4 +- doc/sphinx/ext/traclinks.py | 3 +- ...idgedb.Bridges.rst => bridgedb.bridgerings.rst} | 6 +- doc/sphinx/source/bridgedb.rst | 2 +- doc/sphinx/source/conf.py | 2 +- requirements.txt | 13 +- scripts/nagios-email-check | 201 ++ scripts/setup-tests | 2 +- 128 files changed, 17656 insertions(+), 12991 deletions(-)