commit 77293a3cca19b1fbe9d58cc1596f54cd0bd140a4 Merge: 5ccdda5 3c342d7 Author: Isis Lovecruft <isis@torproject.org> Date: Wed May 14 23:16:40 2014 +0000 Merge branch 'fix/11215-captcha-timeouts' into develop doc/sphinx/source/bridgedb.rst | 1 + doc/sphinx/source/bridgedb.schedule.rst | 10 ++ doc/sphinx/source/conf.py | 1 + lib/bridgedb/HTTPServer.py | 18 ++- lib/bridgedb/Main.py | 10 +- lib/bridgedb/Tests.py | 4 +- lib/bridgedb/Time.py | 132 --------------- lib/bridgedb/captcha.py | 79 ++++++--- lib/bridgedb/email/server.py | 4 +- lib/bridgedb/schedule.py | 267 +++++++++++++++++++++++++++++++ lib/bridgedb/test/test_HTTPServer.py | 4 +- lib/bridgedb/test/test_captcha.py | 12 +- lib/bridgedb/test/test_email_server.py | 6 +- lib/bridgedb/test/test_schedule.py | 201 +++++++++++++++++++++++ 14 files changed, 572 insertions(+), 177 deletions(-)