[tor-commits] [bridgedb/master] Merge branch 'feature/2017-update-year' into develop

[isis at torproject.org]

commit 38e9bb643a0cb1d5ad720bc4120086ae4ce3ab62
Merge: ab51b84 cccfc98
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Jul 7 02:23:29 2017 +0000

    Merge branch 'feature/2017-update-year' into develop

 bridgedb.conf                   |  4 ++--
 bridgedb/Bridges.py             |  2 +-
 bridgedb/Main.py                |  8 ++++----
 bridgedb/Stability.py           | 10 +++++-----
 bridgedb/bridgerequest.py       |  4 ++--
 bridgedb/bridges.py             |  4 ++--
 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 +++---
 bridgedb/translations.py        |  4 ++--
 bridgedb/txrecaptcha.py         |  4 ++--
 bridgedb/util.py                |  6 +++---
 test/deprecated.py              |  6 +++---
 test/email_helpers.py           |  4 ++--
 test/https_helpers.py           |  4 ++--
 test/test_Bucket.py             |  4 ++--
 test/test_Main.py               |  6 +++---
 test/test_Tests.py              |  6 +++---
 test/test_bridgerequest.py      |  4 ++--
 test/test_bridges.py            |  4 ++--
 test/test_captcha.py            |  4 ++--
 test/test_configure.py          |  4 ++--
 test/test_crypto.py             |  6 +++---
 test/test_distribute.py         |  4 ++--
 test/test_email_distributor.py  |  4 ++--
 test/test_filters.py            |  4 ++--
 test/test_geo.py                |  4 ++--
 test/test_https.py              |  4 ++--
 test/test_https_distributor.py  |  6 +++---
 test/test_https_request.py      |  4 ++--
 test/test_https_server.py       |  4 ++--
 test/test_interfaces.py         |  4 ++--
 test/test_parse_descriptors.py  |  4 ++--
 test/test_parse_headers.py      |  6 +++---
 test/test_parse_nickname.py     |  6 +++---
 test/test_parse_options.py      |  4 ++--
 test/test_parse_versions.py     |  4 ++--
 test/test_proxy.py              |  6 +++---
 test/test_qrcodes.py            |  4 ++--
 test/test_schedule.py           |  4 ++--
 test/test_translations.py       |  4 ++--
 test/test_txrecaptcha.py        |  4 ++--
 test/test_util.py               |  6 +++---
 test/util.py                    |  6 +++---
 67 files changed, 158 insertions(+), 158 deletions(-)