[tor-commits] [bridgedb/develop] Merge branch 'fix/23034' into develop

[isis at torproject.org]

commit 5a67734e8986c39b96dab4ce25a16ab799cb30b5
Merge: 38e9bb6 31f6e51
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Jul 25 21:01:20 2017 +0000

    Merge branch 'fix/23034' into develop

 Makefile                                              | 2 +-
 {test => bridgedb/test}/README                        | 0
 {test => bridgedb/test}/__init__.py                   | 0
 {test => bridgedb/test}/deprecated.py                 | 0
 {test => bridgedb/test}/email_helpers.py              | 0
 {test => bridgedb/test}/https_helpers.py              | 0
 {test => bridgedb/test}/legacy_Tests.py               | 0
 {test => bridgedb/test}/test_Bucket.py                | 0
 {test => bridgedb/test}/test_Main.py                  | 0
 {test => bridgedb/test}/test_Storage.py               | 0
 {test => bridgedb/test}/test_Tests.py                 | 0
 {test => bridgedb/test}/test_bridgedb.py              | 0
 {test => bridgedb/test}/test_bridgerequest.py         | 0
 {test => bridgedb/test}/test_bridges.py               | 0
 {test => bridgedb/test}/test_captcha.py               | 0
 {test => bridgedb/test}/test_configure.py             | 0
 {test => bridgedb/test}/test_crypto.py                | 0
 {test => bridgedb/test}/test_distribute.py            | 0
 {test => bridgedb/test}/test_email_autoresponder.py   | 0
 {test => bridgedb/test}/test_email_distributor.py     | 0
 {test => bridgedb/test}/test_email_dkim.py            | 0
 {test => bridgedb/test}/test_email_request.py         | 0
 {test => bridgedb/test}/test_email_server.py          | 0
 {test => bridgedb/test}/test_email_templates.py       | 0
 {test => bridgedb/test}/test_filters.py               | 0
 {test => bridgedb/test}/test_geo.py                   | 0
 {test => bridgedb/test}/test_https.py                 | 0
 {test => bridgedb/test}/test_https_distributor.py     | 0
 {test => bridgedb/test}/test_https_request.py         | 0
 {test => bridgedb/test}/test_https_server.py          | 0
 {test => bridgedb/test}/test_interfaces.py            | 0
 {test => bridgedb/test}/test_parse_addr.py            | 0
 {test => bridgedb/test}/test_parse_descriptors.py     | 0
 {test => bridgedb/test}/test_parse_headers.py         | 0
 {test => bridgedb/test}/test_parse_nickname.py        | 0
 {test => bridgedb/test}/test_parse_options.py         | 0
 {test => bridgedb/test}/test_parse_versions.py        | 0
 {test => bridgedb/test}/test_persistent.py            | 0
 {test => bridgedb/test}/test_persistentSaveAndLoad.py | 0
 {test => bridgedb/test}/test_proxy.py                 | 0
 {test => bridgedb/test}/test_qrcodes.py               | 0
 {test => bridgedb/test}/test_safelog.py               | 0
 {test => bridgedb/test}/test_schedule.py              | 0
 {test => bridgedb/test}/test_smtp.py                  | 0
 {test => bridgedb/test}/test_translations.py          | 0
 {test => bridgedb/test}/test_txrecaptcha.py           | 0
 {test => bridgedb/test}/test_util.py                  | 0
 {test => bridgedb/test}/util.py                       | 0
 setup.py                                              | 4 +++-
 49 files changed, 4 insertions(+), 2 deletions(-)