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

[isis@xxxxxxxxxxxxxx]

commit 513cd253bf3c1a44cc005b7aef9253d6ac4954ac
Merge: a09089c 9495ae8
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Sat Oct 28 00:27:42 2017 +0000

    Merge branch 'release/0.5.0'

 .test.requirements.txt                             |   2 +-
 .travis.requirements.txt                           |   4 +-
 .travis.yml                                        |  20 ++--
 CHANGELOG                                          |  19 ++++
 Makefile                                           |   2 +-
 bridgedb.conf                                      |   4 +-
 bridgedb/Bridges.py                                |  67 ++++++++----
 bridgedb/Main.py                                   |   8 +-
 bridgedb/Stability.py                              |  10 +-
 bridgedb/Storage.py                                |  24 +++++
 bridgedb/bridgerequest.py                          |   4 +-
 bridgedb/bridges.py                                |  14 ++-
 bridgedb/captcha.py                                |   6 +-
 bridgedb/crypto.py                                 |   6 +-
 bridgedb/distribute.py                             |   4 +-
 bridgedb/email/autoresponder.py                    |   4 +-
 bridgedb/email/distributor.py                      |   6 +-
 bridgedb/email/dkim.py                             |   4 +-
 bridgedb/email/request.py                          |   4 +-
 bridgedb/email/server.py                           |   4 +-
 bridgedb/email/templates.py                        |   4 +-
 bridgedb/filters.py                                |   4 +-
 bridgedb/geo.py                                    |   2 +-
 bridgedb/https/distributor.py                      |   6 +-
 bridgedb/https/request.py                          |   4 +-
 bridgedb/https/server.py                           |   4 +-
 bridgedb/interfaces.py                             |   4 +-
 bridgedb/parse/descriptors.py                      |   4 +-
 bridgedb/parse/fingerprint.py                      |   4 +-
 bridgedb/parse/nickname.py                         |   6 +-
 bridgedb/parse/versions.py                         |   6 +-
 bridgedb/persistent.py                             |   6 +-
 bridgedb/proxy.py                                  |   6 +-
 bridgedb/qrcodes.py                                |   4 +-
 bridgedb/runner.py                                 |   6 +-
 bridgedb/safelog.py                                |   4 +-
 bridgedb/schedule.py                               |   4 +-
 bridgedb/strings.py                                |   6 +-
 {test => bridgedb/test}/README                     |   0
 {test => bridgedb/test}/__init__.py                |   0
 {test => bridgedb/test}/deprecated.py              |   6 +-
 {test => bridgedb/test}/email_helpers.py           |   4 +-
 {test => bridgedb/test}/https_helpers.py           |   4 +-
 {test => bridgedb/test}/legacy_Tests.py            |   0
 {test => bridgedb/test}/test_Bucket.py             |   4 +-
 {test => bridgedb/test}/test_Main.py               |   6 +-
 bridgedb/test/test_Storage.py                      | 115 +++++++++++++++++++++
 {test => bridgedb/test}/test_Tests.py              |  10 +-
 {test => bridgedb/test}/test_bridgedb.py           |   4 +-
 {test => bridgedb/test}/test_bridgerequest.py      |   4 +-
 {test => bridgedb/test}/test_bridges.py            |   4 +-
 {test => bridgedb/test}/test_captcha.py            |   4 +-
 {test => bridgedb/test}/test_configure.py          |   4 +-
 {test => bridgedb/test}/test_crypto.py             |  10 +-
 {test => bridgedb/test}/test_distribute.py         |   4 +-
 .../test}/test_email_autoresponder.py              |   6 +-
 {test => bridgedb/test}/test_email_distributor.py  |   6 +-
 {test => bridgedb/test}/test_email_dkim.py         |   0
 {test => bridgedb/test}/test_email_request.py      |   0
 {test => bridgedb/test}/test_email_server.py       |   6 +-
 {test => bridgedb/test}/test_email_templates.py    |   0
 {test => bridgedb/test}/test_filters.py            |   4 +-
 {test => bridgedb/test}/test_geo.py                |   4 +-
 {test => bridgedb/test}/test_https.py              |  10 +-
 {test => bridgedb/test}/test_https_distributor.py  |  12 +--
 {test => bridgedb/test}/test_https_request.py      |   4 +-
 {test => bridgedb/test}/test_https_server.py       |  14 +--
 {test => bridgedb/test}/test_interfaces.py         |   4 +-
 {test => bridgedb/test}/test_parse_addr.py         |   0
 {test => bridgedb/test}/test_parse_descriptors.py  |   6 +-
 {test => bridgedb/test}/test_parse_headers.py      |   6 +-
 {test => bridgedb/test}/test_parse_nickname.py     |   6 +-
 {test => bridgedb/test}/test_parse_options.py      |   4 +-
 {test => bridgedb/test}/test_parse_versions.py     |   4 +-
 {test => bridgedb/test}/test_persistent.py         |   0
 .../test}/test_persistentSaveAndLoad.py            |   0
 {test => bridgedb/test}/test_proxy.py              |   6 +-
 {test => bridgedb/test}/test_qrcodes.py            |   4 +-
 {test => bridgedb/test}/test_safelog.py            |   0
 {test => bridgedb/test}/test_schedule.py           |   4 +-
 {test => bridgedb/test}/test_smtp.py               |   4 +-
 {test => bridgedb/test}/test_translations.py       |   6 +-
 {test => bridgedb/test}/test_txrecaptcha.py        |   4 +-
 {test => bridgedb/test}/test_util.py               |   6 +-
 {test => bridgedb/test}/util.py                    |   6 +-
 bridgedb/translations.py                           |   4 +-
 bridgedb/txrecaptcha.py                            |   4 +-
 bridgedb/util.py                                   |   6 +-
 requirements.txt                                   |   6 +-
 setup.py                                           |   4 +-
 test/test_Storage.py                               |  56 ----------
 91 files changed, 425 insertions(+), 274 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits