commit f824063aecb820e46441d54906b5af3d6e5e75d3 Merge: 5a67734 92a79ac Author: Isis Lovecruft <isis@torproject.org> Date: Tue Jul 25 22:32:00 2017 +0000 Merge branch 'fix/23033' into develop bridgedb/test/test_Tests.py | 4 ++-- bridgedb/test/test_bridgedb.py | 4 ++-- bridgedb/test/test_crypto.py | 4 ++-- bridgedb/test/test_email_autoresponder.py | 6 +++--- bridgedb/test/test_email_distributor.py | 2 +- bridgedb/test/test_email_server.py | 6 +++--- bridgedb/test/test_https.py | 6 +++--- bridgedb/test/test_https_distributor.py | 6 +++--- bridgedb/test/test_https_server.py | 10 +++++----- bridgedb/test/test_parse_descriptors.py | 2 +- bridgedb/test/test_smtp.py | 4 ++-- bridgedb/test/test_translations.py | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-)