commit 659b4ed3bfea6318ac88880d3fb3bad99b44af89 Merge: 513cd25 b4d32c7 Author: Isis Lovecruft isis@torproject.org Date: Tue Sep 12 21:33:22 2017 +0000

Merge branch 'release/0.6.0'

.coveragerc | 2 + .travis.requirements.txt | 2 +- CHANGELOG | 12 + Makefile | 3 + README.rst | 173 ++++ bridgedb.conf | 104 ++- bridgedb/Bridges.py | 2 +- bridgedb/captcha.py | 1 - bridgedb/configure.py | 16 +- bridgedb/distributors/__init__.py | 2 + bridgedb/distributors/common/__init__.py | 2 + bridgedb/distributors/common/http.py | 80 ++ bridgedb/distributors/email/__init__.py | 24 + bridgedb/{ => distributors}/email/autoresponder.py | 24 +- bridgedb/{ => distributors}/email/distributor.py | 13 +- bridgedb/{ => distributors}/email/dkim.py | 6 +- bridgedb/{ => distributors}/email/request.py | 12 +- bridgedb/{ => distributors}/email/server.py | 30 +- bridgedb/{ => distributors}/email/templates.py | 6 +- bridgedb/{ => distributors}/https/__init__.py | 4 + bridgedb/{ => distributors}/https/distributor.py | 19 +- bridgedb/{ => distributors}/https/request.py | 8 +- bridgedb/{ => distributors}/https/server.py | 73 +- .../https/templates/assets/css/bootstrap.min.css | 0 .../https/templates/assets/css/error.css | 0 .../templates/assets/css/font-awesome-ie7.min.css | 0 .../templates/assets/css/font-awesome.min.css | 0 .../https/templates/assets/css/main.css | 0 .../https/templates/assets/css/rtl.css | 0 .../templates/assets/font/fontawesome-webfont.eot | Bin .../templates/assets/font/fontawesome-webfont.svg | 0 .../templates/assets/font/fontawesome-webfont.ttf | Bin .../templates/assets/font/fontawesome-webfont.woff | Bin .../https/templates/assets/font/lato-bold.woff | Bin .../https/templates/assets/font/lato-italic.woff | Bin .../https/templates/assets/font/lato-regular.woff | Bin .../templates/assets/images/404-excavator.svg | 0 .../templates/assets/images/404-hills-left.svg | 0 .../templates/assets/images/404-hills-right.svg | 0 .../assets/images/500-hills-left-shade.svg | 0 .../templates/assets/images/500-hills-left.svg | 0 .../assets/images/500-hills-right-shade.svg | 0 .../templates/assets/images/500-hills-right.svg | 0 .../https/templates/assets/images/500-road.svg | 0 .../assets/images/maintenance-hills-left-shade.svg | 0 .../assets/images/maintenance-hills-left.svg | 0 .../images/maintenance-hills-right-shade.svg | 0 .../assets/images/maintenance-hills-right.svg | 0 .../assets/images/maintenance-tractor.svg | 0 .../https/templates/assets/js/bridges.js | 0 .../https/templates/assets/tor-roots-blue.svg | 0 .../https/templates/assets/tor.svg | 0 .../{ => distributors}/https/templates/base.html | 0 .../https/templates/bridges.html | 0 .../https/templates/captcha.html | 0 .../https/templates/error-404.html | 0 .../https/templates/error-500.html | 0 .../https/templates/error-503.html | 0 .../{ => distributors}/https/templates/howto.html | 0 .../{ => distributors}/https/templates/index.html | 0 .../https/templates/options.html | 0 .../{ => distributors}/https/templates/robots.txt | 0 bridgedb/distributors/moat/__init__.py | 4 + bridgedb/distributors/moat/distributor.py | 64 ++ bridgedb/distributors/moat/request.py | 133 +++ bridgedb/distributors/moat/server.py | 776 +++++++++++++++++ bridgedb/email/__init__.py | 1 - bridgedb/{Main.py => main.py} | 95 ++- bridgedb/parse/addr.py | 4 +- bridgedb/parse/blacklist.py | 12 +- bridgedb/parse/options.py | 8 +- bridgedb/persistent.py | 4 +- bridgedb/proxy.py | 2 +- bridgedb/runner.py | 2 +- bridgedb/strings.py | 4 +- bridgedb/test/email_helpers.py | 14 +- bridgedb/test/https_helpers.py | 9 +- bridgedb/test/legacy_Tests.py | 8 +- bridgedb/test/moat_helpers.py | 110 +++ .../{test_bridgedb.py => test_bridgedb_script.py} | 0 bridgedb/test/test_distributors_common_http.py | 100 +++ bridgedb/test/test_distributors_moat_request.py | 52 ++ bridgedb/test/test_distributors_moat_server.py | 918 +++++++++++++++++++++ bridgedb/test/test_email_autoresponder.py | 14 +- bridgedb/test/test_email_distributor.py | 12 +- bridgedb/test/test_email_dkim.py | 4 +- bridgedb/test/test_email_request.py | 4 +- bridgedb/test/test_email_server.py | 20 +- bridgedb/test/test_email_templates.py | 4 +- bridgedb/test/test_https_distributor.py | 6 +- bridgedb/test/test_https_request.py | 4 +- bridgedb/test/test_https_server.py | 108 +-- bridgedb/test/{test_Main.py => test_main.py} | 255 +++--- bridgedb/test/test_parse_blacklist.py | 56 ++ doc/sphinx/requirements-for-sphinx-builds.txt | 11 +- doc/sphinx/source/bridgedb.distributors.email.rst | 15 + doc/sphinx/source/bridgedb.distributors.https.rst | 12 + doc/sphinx/source/bridgedb.email.rst | 15 - doc/sphinx/source/bridgedb.https.rst | 12 - .../{bridgedb.Main.rst => bridgedb.main.rst} | 6 +- doc/sphinx/source/bridgedb.rst | 6 +- doc/sphinx/source/conf.py | 27 +- requirements.txt | 2 +- scripts/bridgedb | 2 +- scripts/setup-tests | 7 + setup.py | 11 +- 106 files changed, 3071 insertions(+), 480 deletions(-)