[tor-commits] [bridgedb/master] Merge branch 'fix/11127-recaptcha-ssl_10809r1_r1' into develop

[isis at torproject.org]

commit 8d927c1bf3e1ad7fb8b09c1884f6667cf89596f9
Merge: 35effa8 84dd0f3
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat Mar 15 07:43:05 2014 +0000

    Merge branch 'fix/11127-recaptcha-ssl_10809r1_r1' into develop

 lib/bridgedb/HTTPServer.py            |    7 +-
 lib/bridgedb/captcha.py               |    3 +-
 lib/bridgedb/crypto.py                |   98 ++++++++++++-
 lib/bridgedb/test/test_crypto.py      |  104 +++++++++++++
 lib/bridgedb/test/test_txrecaptcha.py |  261 +++++++++++++++++++++++++++++++++
 lib/bridgedb/txrecaptcha.py           |  215 +++++++++++++++++++++++++++
 6 files changed, 683 insertions(+), 5 deletions(-)