commit 35effa8311cc7fa0fec9b4395c125cdd4052eed5 Merge: aec0a06 f508c2d Author: Isis Lovecruft isis@torproject.org Date: Sat Mar 15 03:35:57 2014 +0000

Merge branch 'fix/10809-gimp-captcha_r1' into develop

.gitignore | 3 + bridgedb.conf | 17 +- captchas/Tvx74PMy.jpg | Bin 0 -> 61434 bytes 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 | 33 +-- lib/bridgedb/Dist.py | 45 ++-- lib/bridgedb/HTTPServer.py | 447 ++++++++++++++++++++++++++------ lib/bridgedb/Main.py | 10 +- lib/bridgedb/Raptcha.py | 40 --- lib/bridgedb/captcha.py | 260 +++++++++++++++++++ lib/bridgedb/crypto.py | 127 ++++++++- lib/bridgedb/templates/captcha.html | 18 +- lib/bridgedb/test/test_captcha.py | 237 +++++++++++++++++ requirements.txt | 1 + 17 files changed, 1052 insertions(+), 206 deletions(-)