commit e08b98e42ae8791b160bb598443e837cbbcde0ec Merge: 09198e1 9955bd5 Author: Isis Lovecruft isis@torproject.org Date: Tue Feb 3 02:28:55 2015 +0000

Merge branch 'release-0.2.4'

.test.requirements.txt | 3 +- .travis.requirements.txt | 24 ++ .travis.yml | 29 +- CHANGELOG | 8 +- README | 277 ------------- README.md | 1 - README.rst | 425 ++++++++++++++++++++ bridgedb.conf | 10 +- doc/HACKING.md | 17 + doc/sphinx/requirements-for-sphinx-builds.txt | 2 +- doc/sphinx/source/_static/bay-bridge.jpg | Bin 0 -> 113187 bytes doc/sphinx/source/bridgedb.bridgerequest.rst | 8 + doc/sphinx/source/bridgedb.configure.rst | 8 + doc/sphinx/source/bridgedb.email.autoresponder.rst | 8 - doc/sphinx/source/bridgedb.email.dkim.rst | 8 - doc/sphinx/source/bridgedb.email.request.rst | 8 - doc/sphinx/source/bridgedb.email.rst | 14 + doc/sphinx/source/bridgedb.email.server.rst | 8 - doc/sphinx/source/bridgedb.email.templates.rst | 8 - doc/sphinx/source/bridgedb.interfaces.rst | 8 + doc/sphinx/source/bridgedb.rst | 9 +- doc/sphinx/source/bridgedb.translations.rst | 8 + doc/sphinx/source/conf.py | 2 +- doc/sphinx/source/index.rst | 24 +- doc/sphinx/source/readme.rst | 2 + lib/bridgedb/Bridges.py | 78 ++-- lib/bridgedb/Bucket.py | 194 +++++---- lib/bridgedb/HTTPServer.py | 11 +- lib/bridgedb/Main.py | 126 +----- lib/bridgedb/Tests.py | 4 +- lib/bridgedb/bridgerequest.py | 5 +- lib/bridgedb/configure.py | 132 ++++++ lib/bridgedb/email/autoresponder.py | 124 +++--- lib/bridgedb/email/dkim.py | 32 +- lib/bridgedb/email/request.py | 19 +- lib/bridgedb/email/server.py | 109 +++-- lib/bridgedb/email/templates.py | 42 +- lib/bridgedb/interfaces.py | 19 + lib/bridgedb/parse/addr.py | 64 ++- lib/bridgedb/parse/fingerprint.py | 44 ++ lib/bridgedb/parse/options.py | 9 +- lib/bridgedb/persistent.py | 14 +- lib/bridgedb/qrcodes.py | 77 ++++ lib/bridgedb/strings.py | 3 + lib/bridgedb/templates/assets/css/custom.css | 44 +- lib/bridgedb/templates/base.html | 37 +- lib/bridgedb/templates/bridges.html | 146 ++++++- lib/bridgedb/templates/options.html | 1 + lib/bridgedb/test/deprecated.py | 33 ++ lib/bridgedb/test/test_Bucket.py | 63 +++ lib/bridgedb/test/test_HTTPServer.py | 10 +- lib/bridgedb/test/test_Tests.py | 6 + lib/bridgedb/test/test_bridgedb.py | 172 ++++---- lib/bridgedb/test/test_bridgerequest.py | 44 ++ lib/bridgedb/test/test_configure.py | 67 +++ lib/bridgedb/test/test_https.py | 385 ++++++++++++++++++ lib/bridgedb/test/test_parse_options.py | 102 +++++ lib/bridgedb/test/test_parse_versions.py | 42 ++ lib/bridgedb/test/test_smtp.py | 195 +++++++++ lib/bridgedb/test/util.py | 46 +++ requirements.txt | 4 +- setup.py | 2 +- 62 files changed, 2542 insertions(+), 882 deletions(-)