commit ac80d7d2e8d81859c4409ab51f5e96c063029074 Merge: 94dd106 abece06 Author: Isis Lovecruft isis@torproject.org Date: Sat Jul 25 19:23:51 2015 +0000
Merge branch 'release/0.3.3'
.gitattributes | 2 +- .gitignore | 4 +- .pylintrc | 2 +- .travis.requirements.txt | 2 +- CHANGELOG | 109 +- MANIFEST.in | 2 + Makefile | 10 +- bridgedb.conf | 48 +- bridgedb/Bridges.py | 684 +++++++ bridgedb/Bucket.py | 288 +++ bridgedb/Main.py | 507 +++++ bridgedb/Stability.py | 295 +++ bridgedb/Storage.py | 466 +++++ bridgedb/__init__.py | 17 + bridgedb/_langs.py | 26 + bridgedb/_version.py | 460 +++++ bridgedb/bridgerequest.py | 242 +++ bridgedb/bridges.py | 1797 +++++++++++++++++ bridgedb/captcha.py | 404 ++++ bridgedb/configure.py | 162 ++ bridgedb/crypto.py | 455 +++++ bridgedb/distribute.py | 282 +++ bridgedb/email/__init__.py | 1 + bridgedb/email/autoresponder.py | 717 +++++++ bridgedb/email/distributor.py | 230 +++ bridgedb/email/dkim.py | 74 + bridgedb/email/request.py | 175 ++ bridgedb/email/server.py | 507 +++++ bridgedb/email/templates.py | 200 ++ bridgedb/filters.py | 255 +++ bridgedb/geo.py | 82 + bridgedb/https/__init__.py | 1 + bridgedb/https/distributor.py | 336 ++++ bridgedb/https/request.py | 146 ++ bridgedb/https/server.py | 1079 +++++++++++ .../https/templates/assets/css/bootstrap.min.css | 7 + .../templates/assets/css/font-awesome-ie7.min.css | 384 ++++ .../templates/assets/css/font-awesome.min.css | 403 ++++ bridgedb/https/templates/assets/css/main.css | 441 +++++ bridgedb/https/templates/assets/css/rtl.css | 7 + .../templates/assets/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 ++++ .../templates/assets/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes .../https/templates/assets/font/lato-bold.woff | Bin 0 -> 46160 bytes .../https/templates/assets/font/lato-italic.woff | Bin 0 -> 47168 bytes .../https/templates/assets/font/lato-regular.woff | Bin 0 -> 46108 bytes bridgedb/https/templates/assets/js/bridges.js | 83 + bridgedb/https/templates/assets/tor-roots-blue.svg | 95 + bridgedb/https/templates/assets/tor.svg | 6 + bridgedb/https/templates/base.html | 100 + bridgedb/https/templates/bridges.html | 139 ++ bridgedb/https/templates/captcha.html | 49 + bridgedb/https/templates/howto.html | 36 + bridgedb/https/templates/index.html | 43 + bridgedb/https/templates/options.html | 154 ++ bridgedb/https/templates/robots.txt | 1079 +++++++++++ bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 396 ++++ bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 387 ++++ bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 389 ++++ bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po | 102 + bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 386 ++++ bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 393 ++++ bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 364 ++++ bridgedb/i18n/en/LC_MESSAGES/bridgedb.po | 433 +++++ bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 383 ++++ bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po | 433 +++++ bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 ++++ bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 391 ++++ bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 102 + bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 101 + bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 388 ++++ bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 388 ++++ bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 396 ++++ bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 385 ++++ bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 101 + bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 105 + bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 385 ++++ bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 385 ++++ bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 385 ++++ bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 392 ++++ bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 386 ++++ bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 360 ++++ bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 102 + bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 + bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 383 ++++ bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 101 + bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 102 + bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 387 ++++ bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 392 ++++ bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 390 ++++ bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 389 ++++ bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 387 ++++ bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 387 ++++ bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 391 ++++ bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 100 + bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 385 ++++ bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 359 ++++ bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 381 ++++ bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po | 383 ++++ bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 389 ++++ bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/templates/bridgedb.pot | 391 ++++ bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 101 + bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 392 ++++ bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 386 ++++ bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 389 ++++ bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 382 ++++ bridgedb/interfaces.py | 71 + bridgedb/parse/__init__.py | 79 + bridgedb/parse/addr.py | 589 ++++++ bridgedb/parse/descriptors.py | 299 +++ bridgedb/parse/fingerprint.py | 66 + bridgedb/parse/headers.py | 79 + bridgedb/parse/nickname.py | 58 + bridgedb/parse/options.py | 295 +++ bridgedb/parse/versions.py | 129 ++ bridgedb/persistent.py | 264 +++ bridgedb/proxy.py | 476 +++++ bridgedb/qrcodes.py | 77 + bridgedb/runner.py | 109 ++ bridgedb/safelog.py | 204 ++ bridgedb/schedule.py | 331 ++++ bridgedb/sitecustomize.py | 34 + bridgedb/strings.py | 565 ++++++ bridgedb/translations.py | 122 ++ bridgedb/txrecaptcha.py | 304 +++ bridgedb/util.py | 389 ++++ .../XXX-bridgedb-database-improvements.txt | 4 +- doc/proposals/XXX-bridgedb-social-distribution.txt | 2 +- doc/sphinx/ext/traclinks.py | 47 + doc/sphinx/source/bridgedb.Dist.rst | 8 - doc/sphinx/source/bridgedb.Filters.rst | 8 - doc/sphinx/source/bridgedb.HTTPServer.rst | 8 - doc/sphinx/source/bridgedb.distribute.rst | 8 + doc/sphinx/source/bridgedb.email.rst | 1 + doc/sphinx/source/bridgedb.filters.rst | 8 + doc/sphinx/source/bridgedb.https.rst | 12 + doc/sphinx/source/bridgedb.rst | 10 +- doc/sphinx/source/conf.py | 63 +- doc/sphinx/source/index.rst | 53 +- lib/bridgedb/Bridges.py | 711 ------- lib/bridgedb/Bucket.py | 288 --- lib/bridgedb/Dist.py | 530 ----- lib/bridgedb/Filters.py | 120 -- lib/bridgedb/HTTPServer.py | 932 --------- lib/bridgedb/Main.py | 573 ------ lib/bridgedb/Stability.py | 237 --- lib/bridgedb/Storage.py | 468 ----- lib/bridgedb/__init__.py | 17 - lib/bridgedb/_langs.py | 26 - lib/bridgedb/_version.py | 197 -- lib/bridgedb/bridgerequest.py | 186 -- lib/bridgedb/bridges.py | 1654 ---------------- lib/bridgedb/captcha.py | 392 ---- lib/bridgedb/configure.py | 157 -- lib/bridgedb/crypto.py | 450 ----- lib/bridgedb/email/__init__.py | 1 - lib/bridgedb/email/autoresponder.py | 711 ------- lib/bridgedb/email/dkim.py | 73 - lib/bridgedb/email/request.py | 186 -- lib/bridgedb/email/server.py | 496 ----- lib/bridgedb/email/templates.py | 212 -- lib/bridgedb/geo.py | 82 - lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 368 ---- lib/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 386 ---- lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 363 ---- lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po | 102 - lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 384 ---- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 389 ---- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 364 ---- lib/bridgedb/i18n/en/LC_MESSAGES/bridgedb.po | 433 ----- lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 382 ---- lib/bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po | 433 ----- lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 ---- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 388 ---- lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 102 - lib/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 101 - lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 387 ---- lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 386 ---- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 393 ---- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 383 ---- lib/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 101 - lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 105 - lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 384 ---- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 384 ---- lib/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 101 - lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 391 ---- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 362 ---- lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 360 ---- lib/bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 102 - lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 - lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 359 ---- lib/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 101 - lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 102 - lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 384 ---- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 390 ---- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 388 ---- lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 387 ---- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 386 ---- lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 360 ---- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 389 ---- lib/bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 100 - lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 361 ---- lib/bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 359 ---- lib/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 380 ---- lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 387 ---- lib/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/templates/bridgedb.pot | 391 ---- lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 101 - lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 389 ---- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 384 ---- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 388 ---- lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 358 ---- lib/bridgedb/interfaces.py | 19 - lib/bridgedb/parse/__init__.py | 79 - lib/bridgedb/parse/addr.py | 592 ------ lib/bridgedb/parse/descriptors.py | 278 --- lib/bridgedb/parse/fingerprint.py | 46 - lib/bridgedb/parse/headers.py | 79 - lib/bridgedb/parse/nickname.py | 58 - lib/bridgedb/parse/options.py | 296 --- lib/bridgedb/parse/versions.py | 129 -- lib/bridgedb/persistent.py | 260 --- lib/bridgedb/proxy.py | 473 ----- lib/bridgedb/qrcodes.py | 77 - lib/bridgedb/runner.py | 109 -- lib/bridgedb/safelog.py | 197 -- lib/bridgedb/schedule.py | 326 ---- lib/bridgedb/sitecustomize.py | 34 - lib/bridgedb/strings.py | 299 --- lib/bridgedb/templates/assets/bridgedb.png | Bin 2946 -> 0 bytes .../templates/assets/css/bootstrap.min.css | 7 - lib/bridgedb/templates/assets/css/custom.css | 158 -- .../templates/assets/css/font-awesome-ie7.min.css | 384 ---- .../templates/assets/css/font-awesome.min.css | 403 ---- lib/bridgedb/templates/assets/css/main.css | 24 - .../templates/assets/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 ---- .../templates/assets/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes lib/bridgedb/templates/assets/font/lato-bold.woff | Bin 46160 -> 0 bytes .../templates/assets/font/lato-italic.woff | Bin 47168 -> 0 bytes .../templates/assets/font/lato-regular.woff | Bin 46108 -> 0 bytes lib/bridgedb/templates/assets/tor-roots-blue.svg | 95 - lib/bridgedb/templates/assets/tor.svg | 6 - lib/bridgedb/templates/base.html | 108 -- lib/bridgedb/templates/bridgedb.asc | 252 --- lib/bridgedb/templates/bridges.html | 200 -- lib/bridgedb/templates/captcha.html | 63 - lib/bridgedb/templates/howto.html | 39 - lib/bridgedb/templates/index.html | 43 - lib/bridgedb/templates/options.html | 164 -- lib/bridgedb/templates/robots.txt | 1079 ----------- lib/bridgedb/test/deprecated.py | 702 ------- lib/bridgedb/test/deprecated_networkstatus.py | 275 --- lib/bridgedb/test/email_helpers.py | 181 -- lib/bridgedb/test/legacy_Tests.py | 660 ------- lib/bridgedb/test/test_Bucket.py | 63 - lib/bridgedb/test/test_HTTPServer.py | 703 ------- lib/bridgedb/test/test_Main.py | 432 ----- lib/bridgedb/test/test_Storage.py | 56 - lib/bridgedb/test/test_Tests.py | 259 --- lib/bridgedb/test/test_bridgedb.py | 103 - lib/bridgedb/test/test_bridgerequest.py | 44 - lib/bridgedb/test/test_bridges.py | 1647 ---------------- lib/bridgedb/test/test_captcha.py | 337 ---- lib/bridgedb/test/test_configure.py | 67 - lib/bridgedb/test/test_crypto.py | 392 ---- lib/bridgedb/test/test_email_autoresponder.py | 571 ------ lib/bridgedb/test/test_email_dkim.py | 86 - lib/bridgedb/test/test_email_request.py | 276 --- lib/bridgedb/test/test_email_server.py | 544 ------ lib/bridgedb/test/test_email_templates.py | 119 -- lib/bridgedb/test/test_geo.py | 96 - lib/bridgedb/test/test_https.py | 415 ---- lib/bridgedb/test/test_parse_addr.py | 749 ------- lib/bridgedb/test/test_parse_descriptors.py | 731 ------- lib/bridgedb/test/test_parse_headers.py | 52 - lib/bridgedb/test/test_parse_nickname.py | 63 - lib/bridgedb/test/test_parse_options.py | 102 - lib/bridgedb/test/test_parse_versions.py | 42 - lib/bridgedb/test/test_persistent.py | 170 -- lib/bridgedb/test/test_persistentSaveAndLoad.py | 163 -- lib/bridgedb/test/test_proxy.py | 590 ------ lib/bridgedb/test/test_qrcodes.py | 73 - lib/bridgedb/test/test_safelog.py | 336 ---- lib/bridgedb/test/test_schedule.py | 224 --- lib/bridgedb/test/test_smtp.py | 196 -- lib/bridgedb/test/test_translations.py | 78 - lib/bridgedb/test/test_txrecaptcha.py | 270 --- lib/bridgedb/test/test_util.py | 144 -- lib/bridgedb/test/util.py | 179 -- lib/bridgedb/translations.py | 122 -- lib/bridgedb/txrecaptcha.py | 299 --- lib/bridgedb/util.py | 304 --- maint/get-completed-translations | 27 +- requirements.txt | 2 +- scripts/bridgedb | 2 +- scripts/get-tor-exits | 17 +- scripts/setup-tests | 1 + setup.cfg | 35 +- setup.py | 41 +- test/deprecated.py | 448 +++++ test/email_helpers.py | 180 ++ test/https_helpers.py | 161 ++ test/legacy_Tests.py | 334 ++++ test/test_Bucket.py | 63 + test/test_Main.py | 437 +++++ test/test_Storage.py | 56 + test/test_Tests.py | 249 +++ test/test_bridgedb.py | 103 + test/test_bridgerequest.py | 58 + test/test_bridges.py | 1839 ++++++++++++++++++ test/test_captcha.py | 337 ++++ test/test_configure.py | 67 + test/test_crypto.py | 393 ++++ test/test_distribute.py | 44 + test/test_email_autoresponder.py | 572 ++++++ test/test_email_distributor.py | 259 +++ test/test_email_dkim.py | 86 + test/test_email_request.py | 276 +++ test/test_email_server.py | 544 ++++++ test/test_email_templates.py | 119 ++ test/test_filters.py | 333 ++++ test/test_geo.py | 96 + test/test_https.py | 437 +++++ test/test_https_distributor.py | 406 ++++ test/test_https_request.py | 91 + test/test_https_server.py | 963 +++++++++ test/test_interfaces.py | 55 + test/test_parse_addr.py | 749 +++++++ test/test_parse_descriptors.py | 879 +++++++++ test/test_parse_headers.py | 52 + test/test_parse_nickname.py | 63 + test/test_parse_options.py | 102 + test/test_parse_versions.py | 42 + test/test_persistent.py | 170 ++ test/test_persistentSaveAndLoad.py | 163 ++ test/test_proxy.py | 590 ++++++ test/test_qrcodes.py | 73 + test/test_safelog.py | 335 ++++ test/test_schedule.py | 224 +++ test/test_smtp.py | 206 ++ test/test_translations.py | 78 + test/test_txrecaptcha.py | 270 +++ test/test_util.py | 144 ++ test/util.py | 301 +++ versioneer.py | 2045 +++++++++++++++----- 355 files changed, 50901 insertions(+), 45794 deletions(-)