[tor-commits] [bridgedb/master] Merge branch 'release-0.2.1'

[isis at torproject.org]

commit f848aa9e8a0414ab99066eed8d4d7a9391913294
Merge: 8316a92 b0f56a6
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri May 16 18:46:23 2014 +0000

    Merge branch 'release-0.2.1'

 AUTHORS                                          |   19 +
 CHANGELOG                                        |  100 +++
 Makefile                                         |    9 +
 README                                           |    4 +-
 bridgedb.conf                                    |    7 +-
 doc/DESCRIPTORS.md                               |  191 ------
 doc/bridge-db-spec.txt                           |  391 -----------
 doc/sphinx/requirements-for-sphinx-builds.txt    |    9 +
 doc/sphinx/source/bridgedb.I18n.rst              |    8 -
 doc/sphinx/source/bridgedb.Util.rst              |    9 -
 doc/sphinx/source/bridgedb.parse.rst             |    1 +
 doc/sphinx/source/bridgedb.rst                   |    8 +-
 doc/sphinx/source/bridgedb.schedule.rst          |   10 +
 doc/sphinx/source/bridgedb.strings.rst           |    8 +
 doc/sphinx/source/bridgedb.util.rst              |    9 +
 doc/sphinx/source/conf.py                        |    7 +-
 doc/sphinx/source/descriptors.rst                |  246 +++++++
 doc/sphinx/source/index.rst                      |   19 +-
 gnupghome/TESTING.subkeys.sec                    |  Bin 6505 -> 7212 bytes
 gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 |  Bin 0 -> 6505 bytes
 lib/bridgedb/Bridges.py                          |   56 +-
 lib/bridgedb/Bucket.py                           |    8 +-
 lib/bridgedb/Dist.py                             |   66 +-
 lib/bridgedb/EmailServer.py                      |  483 --------------
 lib/bridgedb/HTTPServer.py                       |  273 ++++----
 lib/bridgedb/I18n.py                             |   88 ---
 lib/bridgedb/Main.py                             |   16 +-
 lib/bridgedb/Storage.py                          |   77 ---
 lib/bridgedb/Tests.py                            |   53 +-
 lib/bridgedb/Time.py                             |  129 ----
 lib/bridgedb/bridgerequest.py                    |  128 ++++
 lib/bridgedb/captcha.py                          |  259 ++++++--
 lib/bridgedb/crypto.py                           |   89 ++-
 lib/bridgedb/email/request.py                    |  169 +++++
 lib/bridgedb/email/server.py                     |  761 ++++++++++++++++++++++
 lib/bridgedb/email/templates.py                  |  187 ++++++
 lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po     |  102 +++
 lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po     |   14 +-
 lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po     |  102 +++
 lib/bridgedb/i18n/templates/bridgedb.pot         |  363 +++++++++--
 lib/bridgedb/parse/__init__.py                   |   35 +-
 lib/bridgedb/parse/addr.py                       |  207 +++---
 lib/bridgedb/parse/headers.py                    |   27 +-
 lib/bridgedb/parse/networkstatus.py              |   57 +-
 lib/bridgedb/parse/options.py                    |   39 +-
 lib/bridgedb/parse/versions.py                   |  102 ++-
 lib/bridgedb/schedule.py                         |  267 ++++++++
 lib/bridgedb/strings.py                          |  192 ++++++
 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/bridgedb.conf                  |   55 --
 lib/bridgedb/test/test_Bridges.py                |   74 ++-
 lib/bridgedb/test/test_EmailServer.py            |  344 ----------
 lib/bridgedb/test/test_HTTPServer.py             |   15 +-
 lib/bridgedb/test/test_captcha.py                |   82 +--
 lib/bridgedb/test/test_crypto.py                 |  206 ++++++
 lib/bridgedb/test/test_email_request.py          |  276 ++++++++
 lib/bridgedb/test/test_email_server.py           |  429 ++++++++++++
 lib/bridgedb/test/test_email_templates.py        |  119 ++++
 lib/bridgedb/test/test_parse_addr.py             |  134 ++++
 lib/bridgedb/test/test_parse_headers.py          |   52 ++
 lib/bridgedb/test/test_schedule.py               |  201 ++++++
 lib/bridgedb/test/test_util.py                   |   60 ++
 requirements-doc.txt                             |    9 -
 setup.cfg                                        |    7 +-
 setup.py                                         |    6 +-
 72 files changed, 5483 insertions(+), 2818 deletions(-)