commit 783babcf84c42788f1bdd5cd43a39e3e569839d8 Merge: e2f859c ac9aa95 Author: Isis Lovecruft isis@torproject.org Date: Sun Mar 16 19:01:55 2014 +0000
Merge branch 'release-0.1.5'
.coveragerc | 5 +- .gitignore | 3 + .pylintrc | 2 +- CHANGELOG | 26 ++ Makefile | 6 +- bridgedb.conf | 20 +- captchas/Tvx74PMy.jpg | Bin 0 -> 61434 bytes doc/gsoc2014-volunteer.txt | 117 ++---- doc/sphinx/source/bridgedb.Raptcha.rst | 8 - doc/sphinx/source/bridgedb.captcha.rst | 8 + doc/sphinx/source/bridgedb.rst | 2 +- doc/sphinx/source/conf.py | 2 +- lib/bridgedb/Bridges.py | 57 ++- lib/bridgedb/Dist.py | 45 ++- lib/bridgedb/EmailServer.py | 10 +- lib/bridgedb/HTTPServer.py | 480 +++++++++++++++++++------ lib/bridgedb/Main.py | 32 +- lib/bridgedb/Raptcha.py | 40 --- lib/bridgedb/captcha.py | 261 ++++++++++++++ lib/bridgedb/crypto.py | 249 ++++++++++++- lib/bridgedb/templates/captcha.html | 18 +- lib/bridgedb/test/test_Bridges.py | 30 ++ lib/bridgedb/test/test_captcha.py | 237 ++++++++++++ lib/bridgedb/test/test_crypto.py | 107 +++++- lib/bridgedb/test/test_parse_networkstatus.py | 6 +- lib/bridgedb/test/test_txrecaptcha.py | 261 ++++++++++++++ lib/bridgedb/txrecaptcha.py | 215 +++++++++++ requirements-doc.txt | 9 + requirements.txt | 1 + 29 files changed, 1914 insertions(+), 343 deletions(-)