commit 7fdde318ce5446ff55646ccde44f7586d2d411b6 Merge: 18d8d30 a4dd886 Author: Isis Lovecruft isis@torproject.org Date: Fri Mar 21 22:27:09 2014 +0000

Merge branch 'fix/11231-blank-captcha-field' into develop

lib/bridgedb/HTTPServer.py | 8 +- lib/bridgedb/test/test_HTTPServer.py | 597 +++++++++++++++++++++++++++++++++ lib/bridgedb/test/test_txrecaptcha.py | 21 +- 3 files changed, 616 insertions(+), 10 deletions(-)