[tor-commits] [bridgedb/develop] Merge branch 'fix/5463-7547-7550-8241-11475-11753-email-rewrite' into develop

[isis at torproject.org]

commit 94a348c9593d2c3b120d9de1eff6910a9a9aef53
Merge: 25be173 363606c
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed May 14 03:21:56 2014 +0000

    Merge branch 'fix/5463-7547-7550-8241-11475-11753-email-rewrite' into develop

 lib/bridgedb/Dist.py                       |   49 +-
 lib/bridgedb/EmailServer.py                |  483 ------------------
 lib/bridgedb/HTTPServer.py                 |   86 ++--
 lib/bridgedb/Main.py                       |    6 +-
 lib/bridgedb/bridgerequest.py              |  128 +++++
 lib/bridgedb/email/request.py              |  153 ++++++
 lib/bridgedb/email/server.py               |  746 ++++++++++++++++++++++++++++
 lib/bridgedb/email/templates.py            |  123 +++++
 lib/bridgedb/strings.py                    |   21 +-
 lib/bridgedb/templates/base.html           |   53 +-
 lib/bridgedb/templates/bridgedb.asc        |  300 +++++++++++
 lib/bridgedb/templates/bridges.html        |   34 +-
 lib/bridgedb/templates/captcha.html        |   80 +--
 lib/bridgedb/templates/howto.html          |   26 +-
 lib/bridgedb/templates/index.html          |    9 +-
 lib/bridgedb/templates/options.html        |   52 +-
 lib/bridgedb/templates/static/bridgedb.asc |  274 ----------
 lib/bridgedb/test/test_EmailServer.py      |  344 -------------
 lib/bridgedb/test/test_HTTPServer.py       |    3 +-
 lib/bridgedb/test/test_crypto.py           |   68 +++
 lib/bridgedb/test/test_email_request.py    |  276 ++++++++++
 lib/bridgedb/test/test_email_server.py     |  429 ++++++++++++++++
 setup.py                                   |    1 +
 23 files changed, 2447 insertions(+), 1297 deletions(-)