[tor-commits] [bridgedb/develop] Merge branch 'release-0.3.1'

[isis at torproject.org]

commit 3a1aa0d8506186473e4ea1d8f84b0d5ca56f274e
Merge: 6f0f536 9ec5a96
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Mar 25 19:01:44 2015 +0000

    Merge branch 'release-0.3.1'

 .travis.requirements.txt                      |    4 +-
 CHANGELOG                                     |   42 +++++++++++-
 Makefile                                      |    4 +-
 README.rst                                    |   11 ++--
 lib/bridgedb/Bridges.py                       |    2 +-
 lib/bridgedb/Dist.py                          |    6 +-
 lib/bridgedb/Filters.py                       |    4 +-
 lib/bridgedb/HTTPServer.py                    |    4 +-
 lib/bridgedb/Main.py                          |    8 +--
 lib/bridgedb/bridgerequest.py                 |    8 +--
 lib/bridgedb/bridges.py                       |    8 ++-
 lib/bridgedb/captcha.py                       |    6 +-
 lib/bridgedb/configure.py                     |    8 +--
 lib/bridgedb/crypto.py                        |    8 ++-
 lib/bridgedb/email/autoresponder.py           |    4 +-
 lib/bridgedb/email/dkim.py                    |    4 +-
 lib/bridgedb/email/request.py                 |    4 +-
 lib/bridgedb/email/server.py                  |    4 +-
 lib/bridgedb/email/templates.py               |    4 +-
 lib/bridgedb/i18n/templates/bridgedb.pot      |    2 +-
 lib/bridgedb/interfaces.py                    |    4 +-
 lib/bridgedb/parse/descriptors.py             |   18 ++---
 lib/bridgedb/parse/fingerprint.py             |    4 +-
 lib/bridgedb/parse/nickname.py                |    6 +-
 lib/bridgedb/parse/versions.py                |   17 +++--
 lib/bridgedb/runner.py                        |    5 +-
 lib/bridgedb/safelog.py                       |    4 +-
 lib/bridgedb/schedule.py                      |    4 +-
 lib/bridgedb/strings.py                       |    8 +++
 lib/bridgedb/test/deprecated.py               |    6 +-
 lib/bridgedb/test/deprecated_networkstatus.py |    6 +-
 lib/bridgedb/test/test_Bucket.py              |    4 +-
 lib/bridgedb/test/test_HTTPServer.py          |    4 +-
 lib/bridgedb/test/test_bridgerequest.py       |    4 +-
 lib/bridgedb/test/test_bridges.py             |    4 +-
 lib/bridgedb/test/test_captcha.py             |    4 +-
 lib/bridgedb/test/test_configure.py           |    4 +-
 lib/bridgedb/test/test_crypto.py              |   24 ++++++-
 lib/bridgedb/test/test_https.py               |   32 ++++++++-
 lib/bridgedb/test/test_parse_descriptors.py   |   13 ++--
 lib/bridgedb/test/test_parse_headers.py       |    6 +-
 lib/bridgedb/test/test_parse_options.py       |    4 +-
 lib/bridgedb/test/test_parse_versions.py      |    4 +-
 lib/bridgedb/test/test_schedule.py            |    4 +-
 lib/bridgedb/test/test_translations.py        |    4 +-
 lib/bridgedb/test/test_txrecaptcha.py         |    4 +-
 lib/bridgedb/test/test_util.py                |    6 +-
 lib/bridgedb/translations.py                  |    4 +-
 lib/bridgedb/txrecaptcha.py                   |   88 +++++++++++++++++++++----
 lib/bridgedb/util.py                          |    6 +-
 requirements.txt                              |    2 +-
 setup.py                                      |   13 +++-
 52 files changed, 326 insertions(+), 139 deletions(-)