October 2017 - tor-commits - lists.torproject.org

[bridgedb/develop] Merge branch 'feature/23957' into develop
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 96707e2f0d3c76d23549be236f7d56a22f23f84b Merge: 9de0976 48d4562 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 28 00:18:22 2017 +0000 Merge branch 'feature/23957' into develop .test.requirements.txt | 2 +- .travis.requirements.txt | 4 +-- bridgedb/Bridges.py | 65 +++++++++++++++++++++++++++++----------- bridgedb/Storage.py | 24 +++++++++++++++ bridgedb/bridges.py | 10 +++++++ bridgedb/test/test_Storage.py | 69 +++++++++++++++++++++++++++++++++++++++---- requirements.txt | 2 +- 7 files changed, 150 insertions(+), 26 deletions(-)

1 0

[bridgedb/develop] Add CHANGELOG entries for version 0.5.0.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 9495ae881a622c4fb4e5e9cf052f896ca847d5e4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 28 00:26:27 2017 +0000 Add CHANGELOG entries for version 0.5.0. --- CHANGELOG | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 57e67cf..316e45d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,22 @@ +Changes in version 0.5.0 - 2017-10-28 + + * FIXES #23957 https://bugs.torproject.org/23957 + BridgeDB now supports bridge operators choosing how their bridge + will be distributed. See the "BridgeDistribution" torrc option in + tor's manpage for details. + + * FIXES #16650 https://bugs.torproject.org/16650 + BridgeDB is now accessible via select remote user interfaces + through a meek tunnel. + + * FIXES #22998 https://bugs.torproject.org/23033 + * FIXES #23033 https://bugs.torproject.org/23033 + * FIXES #23034 https://bugs.torproject.org/23034 + Upgrades BridgeDB to newer versions of Twisted and PyOpenSSL, and + fixes several issues due to non-backwards compatible changes + within those libraries. + + Changes in version 0.4.0 - 2017-01-09 * FIXES #21162 https://bugs.torproject.org/21162

1 0

[bridgedb/master] Merge branch 'master' into develop
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit ab51b841590e422d81fe6138929ec52c9fe1167c Merge: 62b17e8 a09089c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jan 9 19:59:05 2017 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] Fix broken relative imports due to upgrading Twisted.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 92a79ac4d6ae0ba4f8bd213a8449742f641d7e4b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 25 22:22:28 2017 +0000 Fix broken relative imports due to upgrading Twisted. * FIXES #23033 --- 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(-) diff --git a/bridgedb/test/test_Tests.py b/bridgedb/test/test_Tests.py index 79e0daa..41bd4ca 100644 --- a/bridgedb/test/test_Tests.py +++ b/bridgedb/test/test_Tests.py @@ -26,8 +26,8 @@ import os from twisted.python import monkey from twisted.trial import unittest -from . import legacy_Tests as Tests -from . import deprecated +from bridgedb.test import legacy_Tests as Tests +from bridgedb.test import deprecated logging.disable(50) diff --git a/bridgedb/test/test_bridgedb.py b/bridgedb/test/test_bridgedb.py index 00c231b..70c71f0 100644 --- a/bridgedb/test/test_bridgedb.py +++ b/bridgedb/test/test_bridgedb.py @@ -21,8 +21,8 @@ from twisted.trial import unittest from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest -from .util import processExists -from .util import getBridgeDBPID +from bridgedb.test.util import processExists +from bridgedb.test.util import getBridgeDBPID class BridgeDBCliTest(unittest.TestCase): diff --git a/bridgedb/test/test_crypto.py b/bridgedb/test/test_crypto.py index 3010b5c..10974bb 100644 --- a/bridgedb/test/test_crypto.py +++ b/bridgedb/test/test_crypto.py @@ -34,8 +34,8 @@ from bridgedb import crypto from bridgedb import txrecaptcha from bridgedb.persistent import Conf -from .util import fileCheckDecorator -from .email_helpers import _createConfig +from bridgedb.test.util import fileCheckDecorator +from bridgedb.test.email_helpers import _createConfig logging.disable(50) diff --git a/bridgedb/test/test_email_autoresponder.py b/bridgedb/test/test_email_autoresponder.py index 77fb77a..6bdac9e 100644 --- a/bridgedb/test/test_email_autoresponder.py +++ b/bridgedb/test/test_email_autoresponder.py @@ -27,9 +27,9 @@ from bridgedb.email import autoresponder from bridgedb.email.server import SMTPMessage from bridgedb.email.distributor import TooSoonEmail -from .email_helpers import _createConfig -from .email_helpers import _createMailServerContext -from .email_helpers import DummyEmailDistributorWithState +from bridgedb.test.email_helpers import _createConfig +from bridgedb.test.email_helpers import _createMailServerContext +from bridgedb.test.email_helpers import DummyEmailDistributorWithState class CreateResponseBodyTests(unittest.TestCase): diff --git a/bridgedb/test/test_email_distributor.py b/bridgedb/test/test_email_distributor.py index dd9997e..0d727b8 100644 --- a/bridgedb/test/test_email_distributor.py +++ b/bridgedb/test/test_email_distributor.py @@ -29,7 +29,7 @@ from bridgedb.parse.addr import BadEmail from bridgedb.parse.addr import UnsupportedDomain from bridgedb.parse.addr import normalizeEmail -from .util import generateFakeBridges +from bridgedb.test.util import generateFakeBridges logging.disable(50) diff --git a/bridgedb/test/test_email_server.py b/bridgedb/test/test_email_server.py index 3a3d62d..946133c 100644 --- a/bridgedb/test/test_email_server.py +++ b/bridgedb/test/test_email_server.py @@ -37,9 +37,9 @@ from bridgedb.email.distributor import TooSoonEmail from bridgedb.parse.addr import BadEmail from bridgedb.schedule import Unscheduled -from . import util -from .email_helpers import _createConfig -from .email_helpers import _createMailServerContext +from bridgedb.test import util +from bridgedb.test.email_helpers import _createConfig +from bridgedb.test.email_helpers import _createMailServerContext class SMTPMessageTests(unittest.TestCase): diff --git a/bridgedb/test/test_https.py b/bridgedb/test/test_https.py index c29d6b0..8432c20 100644 --- a/bridgedb/test/test_https.py +++ b/bridgedb/test/test_https.py @@ -38,9 +38,9 @@ from twisted.trial.reporter import TestResult from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest -from .test_Tests import DynamicTestCaseMeta -from .util import processExists -from .util import getBridgeDBPID +from bridgedb.test.test_Tests import DynamicTestCaseMeta +from bridgedb.test.util import processExists +from bridgedb.test.util import getBridgeDBPID HTTP_ROOT = 'http://127.0.0.1:6788' diff --git a/bridgedb/test/test_https_distributor.py b/bridgedb/test/test_https_distributor.py index a287420..0d20960 100644 --- a/bridgedb/test/test_https_distributor.py +++ b/bridgedb/test/test_https_distributor.py @@ -27,9 +27,9 @@ from bridgedb.https import distributor from bridgedb.https.request import HTTPSBridgeRequest from bridgedb.proxy import ProxySet -from .util import randomValidIPv4String -from .util import generateFakeBridges -from .https_helpers import DummyRequest +from bridgedb.test.util import randomValidIPv4String +from bridgedb.test.util import generateFakeBridges +from bridgedb.test.https_helpers import DummyRequest logging.disable(50) diff --git a/bridgedb/test/test_https_server.py b/bridgedb/test/test_https_server.py index 1880c8b..3827bfe 100644 --- a/bridgedb/test/test_https_server.py +++ b/bridgedb/test/test_https_server.py @@ -30,11 +30,11 @@ from twisted.web.test import requesthelper from bridgedb.https import server from bridgedb.schedule import ScheduledInterval -from .https_helpers import _createConfig -from .https_helpers import DummyRequest -from .https_helpers import DummyHTTPSDistributor -from .util import DummyBridge -from .util import DummyMaliciousBridge +from bridgedb.test.https_helpers import _createConfig +from bridgedb.test.https_helpers import DummyRequest +from bridgedb.test.https_helpers import DummyHTTPSDistributor +from bridgedb.test.util import DummyBridge +from bridgedb.test.util import DummyMaliciousBridge # For additional logger output for debugging, comment out the following: diff --git a/bridgedb/test/test_parse_descriptors.py b/bridgedb/test/test_parse_descriptors.py index bc565e1..df7f34f 100644 --- a/bridgedb/test/test_parse_descriptors.py +++ b/bridgedb/test/test_parse_descriptors.py @@ -33,7 +33,7 @@ except (ImportError, NameError), error: else: HAS_STEM = True -from .util import Benchmarker +from bridgedb.test.util import Benchmarker BRIDGE_NETWORKSTATUS_0 = '''\ diff --git a/bridgedb/test/test_smtp.py b/bridgedb/test/test_smtp.py index 0ac4ada..de443b3 100644 --- a/bridgedb/test/test_smtp.py +++ b/bridgedb/test/test_smtp.py @@ -15,8 +15,8 @@ from twisted.trial import unittest from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest -from .util import processExists -from .util import getBridgeDBPID +from bridgedb.test.util import processExists +from bridgedb.test.util import getBridgeDBPID # ------------- SMTP Client Config SMTP_DEBUG_LEVEL = 0 # set to 1 to see SMTP message exchange diff --git a/bridgedb/test/test_translations.py b/bridgedb/test/test_translations.py index 54c27a0..5f99901 100644 --- a/bridgedb/test/test_translations.py +++ b/bridgedb/test/test_translations.py @@ -11,7 +11,7 @@ from twisted.trial import unittest from bridgedb import translations -from .https_helpers import DummyRequest +from bridgedb.test.https_helpers import DummyRequest REALISH_HEADERS = {

1 0

[bridgedb/master] Move tests back into bridgedb directory to fix `python setup.py test`.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 31f6e514fd4bb647939c222b143c097ee24fa6d3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 25 20:47:23 2017 +0000 Move tests back into bridgedb directory to fix `python setup.py test`. * FIXES #23034. --- 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(-) diff --git a/Makefile b/Makefile index 8aa92a3..906ce94 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ ifeq ($(PYTHON_IMPLEMENTATION),PyPy) @echo "Detected PyPy... not running coverage." python setup.py test else - coverage run --rcfile=".coveragerc" $(TRIAL) ./test/test_*.py + coverage run --rcfile=".coveragerc" $(TRIAL) ./bridgedb/test/test_*.py coverage report --rcfile=".coveragerc" endif diff --git a/test/README b/bridgedb/test/README similarity index 100% rename from test/README rename to bridgedb/test/README diff --git a/test/__init__.py b/bridgedb/test/__init__.py similarity index 100% rename from test/__init__.py rename to bridgedb/test/__init__.py diff --git a/test/deprecated.py b/bridgedb/test/deprecated.py similarity index 100% rename from test/deprecated.py rename to bridgedb/test/deprecated.py diff --git a/test/email_helpers.py b/bridgedb/test/email_helpers.py similarity index 100% rename from test/email_helpers.py rename to bridgedb/test/email_helpers.py diff --git a/test/https_helpers.py b/bridgedb/test/https_helpers.py similarity index 100% rename from test/https_helpers.py rename to bridgedb/test/https_helpers.py diff --git a/test/legacy_Tests.py b/bridgedb/test/legacy_Tests.py similarity index 100% rename from test/legacy_Tests.py rename to bridgedb/test/legacy_Tests.py diff --git a/test/test_Bucket.py b/bridgedb/test/test_Bucket.py similarity index 100% rename from test/test_Bucket.py rename to bridgedb/test/test_Bucket.py diff --git a/test/test_Main.py b/bridgedb/test/test_Main.py similarity index 100% rename from test/test_Main.py rename to bridgedb/test/test_Main.py diff --git a/test/test_Storage.py b/bridgedb/test/test_Storage.py similarity index 100% rename from test/test_Storage.py rename to bridgedb/test/test_Storage.py diff --git a/test/test_Tests.py b/bridgedb/test/test_Tests.py similarity index 100% rename from test/test_Tests.py rename to bridgedb/test/test_Tests.py diff --git a/test/test_bridgedb.py b/bridgedb/test/test_bridgedb.py similarity index 100% rename from test/test_bridgedb.py rename to bridgedb/test/test_bridgedb.py diff --git a/test/test_bridgerequest.py b/bridgedb/test/test_bridgerequest.py similarity index 100% rename from test/test_bridgerequest.py rename to bridgedb/test/test_bridgerequest.py diff --git a/test/test_bridges.py b/bridgedb/test/test_bridges.py similarity index 100% rename from test/test_bridges.py rename to bridgedb/test/test_bridges.py diff --git a/test/test_captcha.py b/bridgedb/test/test_captcha.py similarity index 100% rename from test/test_captcha.py rename to bridgedb/test/test_captcha.py diff --git a/test/test_configure.py b/bridgedb/test/test_configure.py similarity index 100% rename from test/test_configure.py rename to bridgedb/test/test_configure.py diff --git a/test/test_crypto.py b/bridgedb/test/test_crypto.py similarity index 100% rename from test/test_crypto.py rename to bridgedb/test/test_crypto.py diff --git a/test/test_distribute.py b/bridgedb/test/test_distribute.py similarity index 100% rename from test/test_distribute.py rename to bridgedb/test/test_distribute.py diff --git a/test/test_email_autoresponder.py b/bridgedb/test/test_email_autoresponder.py similarity index 100% rename from test/test_email_autoresponder.py rename to bridgedb/test/test_email_autoresponder.py diff --git a/test/test_email_distributor.py b/bridgedb/test/test_email_distributor.py similarity index 100% rename from test/test_email_distributor.py rename to bridgedb/test/test_email_distributor.py diff --git a/test/test_email_dkim.py b/bridgedb/test/test_email_dkim.py similarity index 100% rename from test/test_email_dkim.py rename to bridgedb/test/test_email_dkim.py diff --git a/test/test_email_request.py b/bridgedb/test/test_email_request.py similarity index 100% rename from test/test_email_request.py rename to bridgedb/test/test_email_request.py diff --git a/test/test_email_server.py b/bridgedb/test/test_email_server.py similarity index 100% rename from test/test_email_server.py rename to bridgedb/test/test_email_server.py diff --git a/test/test_email_templates.py b/bridgedb/test/test_email_templates.py similarity index 100% rename from test/test_email_templates.py rename to bridgedb/test/test_email_templates.py diff --git a/test/test_filters.py b/bridgedb/test/test_filters.py similarity index 100% rename from test/test_filters.py rename to bridgedb/test/test_filters.py diff --git a/test/test_geo.py b/bridgedb/test/test_geo.py similarity index 100% rename from test/test_geo.py rename to bridgedb/test/test_geo.py diff --git a/test/test_https.py b/bridgedb/test/test_https.py similarity index 100% rename from test/test_https.py rename to bridgedb/test/test_https.py diff --git a/test/test_https_distributor.py b/bridgedb/test/test_https_distributor.py similarity index 100% rename from test/test_https_distributor.py rename to bridgedb/test/test_https_distributor.py diff --git a/test/test_https_request.py b/bridgedb/test/test_https_request.py similarity index 100% rename from test/test_https_request.py rename to bridgedb/test/test_https_request.py diff --git a/test/test_https_server.py b/bridgedb/test/test_https_server.py similarity index 100% rename from test/test_https_server.py rename to bridgedb/test/test_https_server.py diff --git a/test/test_interfaces.py b/bridgedb/test/test_interfaces.py similarity index 100% rename from test/test_interfaces.py rename to bridgedb/test/test_interfaces.py diff --git a/test/test_parse_addr.py b/bridgedb/test/test_parse_addr.py similarity index 100% rename from test/test_parse_addr.py rename to bridgedb/test/test_parse_addr.py diff --git a/test/test_parse_descriptors.py b/bridgedb/test/test_parse_descriptors.py similarity index 100% rename from test/test_parse_descriptors.py rename to bridgedb/test/test_parse_descriptors.py diff --git a/test/test_parse_headers.py b/bridgedb/test/test_parse_headers.py similarity index 100% rename from test/test_parse_headers.py rename to bridgedb/test/test_parse_headers.py diff --git a/test/test_parse_nickname.py b/bridgedb/test/test_parse_nickname.py similarity index 100% rename from test/test_parse_nickname.py rename to bridgedb/test/test_parse_nickname.py diff --git a/test/test_parse_options.py b/bridgedb/test/test_parse_options.py similarity index 100% rename from test/test_parse_options.py rename to bridgedb/test/test_parse_options.py diff --git a/test/test_parse_versions.py b/bridgedb/test/test_parse_versions.py similarity index 100% rename from test/test_parse_versions.py rename to bridgedb/test/test_parse_versions.py diff --git a/test/test_persistent.py b/bridgedb/test/test_persistent.py similarity index 100% rename from test/test_persistent.py rename to bridgedb/test/test_persistent.py diff --git a/test/test_persistentSaveAndLoad.py b/bridgedb/test/test_persistentSaveAndLoad.py similarity index 100% rename from test/test_persistentSaveAndLoad.py rename to bridgedb/test/test_persistentSaveAndLoad.py diff --git a/test/test_proxy.py b/bridgedb/test/test_proxy.py similarity index 100% rename from test/test_proxy.py rename to bridgedb/test/test_proxy.py diff --git a/test/test_qrcodes.py b/bridgedb/test/test_qrcodes.py similarity index 100% rename from test/test_qrcodes.py rename to bridgedb/test/test_qrcodes.py diff --git a/test/test_safelog.py b/bridgedb/test/test_safelog.py similarity index 100% rename from test/test_safelog.py rename to bridgedb/test/test_safelog.py diff --git a/test/test_schedule.py b/bridgedb/test/test_schedule.py similarity index 100% rename from test/test_schedule.py rename to bridgedb/test/test_schedule.py diff --git a/test/test_smtp.py b/bridgedb/test/test_smtp.py similarity index 100% rename from test/test_smtp.py rename to bridgedb/test/test_smtp.py diff --git a/test/test_translations.py b/bridgedb/test/test_translations.py similarity index 100% rename from test/test_translations.py rename to bridgedb/test/test_translations.py diff --git a/test/test_txrecaptcha.py b/bridgedb/test/test_txrecaptcha.py similarity index 100% rename from test/test_txrecaptcha.py rename to bridgedb/test/test_txrecaptcha.py diff --git a/test/test_util.py b/bridgedb/test/test_util.py similarity index 100% rename from test/test_util.py rename to bridgedb/test/test_util.py diff --git a/test/util.py b/bridgedb/test/util.py similarity index 100% rename from test/util.py rename to bridgedb/test/util.py diff --git a/setup.py b/setup.py index 97dee01..955a720 100644 --- a/setup.py +++ b/setup.py @@ -377,7 +377,9 @@ setuptools.setup( packages=['bridgedb', 'bridgedb.email', 'bridgedb.https', - 'bridgedb.parse'], + 'bridgedb.parse', + 'bridgedb.test', + ], scripts=['scripts/bridgedb', 'scripts/get-tor-exits'], extras_require={'test': ["sure==1.2.2",

1 0

[bridgedb/master] Merge branch 'feature/2017-update-year' into develop
by isis＠torproject.org 28 Oct '17

28 Oct '17

1 0

[bridgedb/master] Merge branch 'fix/23034' into develop
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 5a67734e8986c39b96dab4ce25a16ab799cb30b5 Merge: 38e9bb6 31f6e51 Author: Isis Lovecruft <isis(a)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(-)

1 0

[bridgedb/master] Update copyright years to 2017.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit cccfc980bf5c3b1213f086d68d2fdcd07c5ace20 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 7 02:14:11 2017 +0000 Update copyright years to 2017. --- 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(-) diff --git a/bridgedb.conf b/bridgedb.conf index 4c547f5..25a9cbf 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -13,8 +13,8 @@ # :authors: The Tor Project, Inc. # :license: This file is freely distributed as part of BridgeDB, see LICENSE # for details. -# :copyright: (c) 2007-2015 The Tor Project, Inc. -# (c) 2007-2015, all sentient entities within the AUTHORS file +# :copyright: (c) 2007-2017 The Tor Project, Inc. +# (c) 2007-2017, all sentient entities within the AUTHORS file # :version: 0.3.3 #=============================================================================== # diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index 7a237fe..ddfb447 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -3,7 +3,7 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2007-2017, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """This module has low-level functionality for parsing bridges and arranging diff --git a/bridgedb/Main.py b/bridgedb/Main.py index 4990904..4273653 100644 --- a/bridgedb/Main.py +++ b/bridgedb/Main.py @@ -3,10 +3,10 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: please see the AUTHORS file for attributions -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2013-2015, Matthew Finkel -# (c) 2007-2015, Nick Mathewson -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2013-2017, Matthew Finkel +# (c) 2007-2017, Nick Mathewson +# (c) 2007-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information """This module sets up BridgeDB and starts the servers running.""" diff --git a/bridgedb/Stability.py b/bridgedb/Stability.py index fbc8e88..f2f99ce 100644 --- a/bridgedb/Stability.py +++ b/bridgedb/Stability.py @@ -3,11 +3,11 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: please see the AUTHORS file for attributions -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2013-2015, Matthew Finkel -# (c) 2012-2015, Aaron Gibson -# (c) 2007-2015, Nick Mathewson -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2013-2017, Matthew Finkel +# (c) 2012-2017, Aaron Gibson +# (c) 2007-2017, Nick Mathewson +# (c) 2007-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information """This module provides functionality for tracking bridge stability metrics. diff --git a/bridgedb/bridgerequest.py b/bridgedb/bridgerequest.py index d24948c..560b704 100644 --- a/bridgedb/bridgerequest.py +++ b/bridgedb/bridgerequest.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/bridges.py b/bridgedb/bridges.py index 56e55cc..4386d4e 100644 --- a/bridgedb/bridges.py +++ b/bridgedb/bridges.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: please see the AUTHORS file for attributions -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information """Classes for manipulating and storing Bridges and their attributes. diff --git a/bridgedb/captcha.py b/bridgedb/captcha.py index bdcd90c..ad89aea 100644 --- a/bridgedb/captcha.py +++ b/bridgedb/captcha.py @@ -7,9 +7,9 @@ # Aaron Gibson 0x2C4B239DD876C9F6 <aagbsn(a)torproject.org> # Nick Mathewson 0x21194EBB165733EA <nickm(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/crypto.py b/bridgedb/crypto.py index 3854602..13af305 100644 --- a/bridgedb/crypto.py +++ b/bridgedb/crypto.py @@ -3,9 +3,9 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """This module contains general utilities for working with external diff --git a/bridgedb/distribute.py b/bridgedb/distribute.py index ac8df5f..ec8fb26 100644 --- a/bridgedb/distribute.py +++ b/bridgedb/distribute.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/email/autoresponder.py b/bridgedb/email/autoresponder.py index f4a93e3..430a50c 100644 --- a/bridgedb/email/autoresponder.py +++ b/bridgedb/email/autoresponder.py @@ -7,8 +7,8 @@ # Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 # Matthew Finkel <sysrqb(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2013-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2013-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/email/distributor.py b/bridgedb/email/distributor.py index 8f60b0f..c6e45d5 100644 --- a/bridgedb/email/distributor.py +++ b/bridgedb/email/distributor.py @@ -5,9 +5,9 @@ # :authors: Nick Mathewson # Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # Matthew Finkel 0x017DD169EA793BE2 <sysrqb(a)torproject.org> -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2013-2015, Matthew Finkel -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2013-2017, Matthew Finkel +# (c) 2007-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information """ diff --git a/bridgedb/email/dkim.py b/bridgedb/email/dkim.py index 7b6adfa..c851c5c 100644 --- a/bridgedb/email/dkim.py +++ b/bridgedb/email/dkim.py @@ -7,8 +7,8 @@ # Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 # Matthew Finkel <sysrqb(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2013-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2013-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/email/request.py b/bridgedb/email/request.py index 5721fa3..71167c7 100644 --- a/bridgedb/email/request.py +++ b/bridgedb/email/request.py @@ -7,8 +7,8 @@ # Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 # Matthew Finkel <sysrqb(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2013-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2013-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/email/server.py b/bridgedb/email/server.py index 010648f..41862e7 100644 --- a/bridgedb/email/server.py +++ b/bridgedb/email/server.py @@ -7,8 +7,8 @@ # Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 # Matthew Finkel <sysrqb(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2013-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2013-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/email/templates.py b/bridgedb/email/templates.py index 6998716..014881e 100644 --- a/bridgedb/email/templates.py +++ b/bridgedb/email/templates.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2013-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2013-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/filters.py b/bridgedb/filters.py index c11c7ce..cac587b 100644 --- a/bridgedb/filters.py +++ b/bridgedb/filters.py @@ -6,8 +6,8 @@ # :authors: Nick Mathewson <nickm(a)torproject.org> # Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2013-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2013-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/geo.py b/bridgedb/geo.py index c986fa1..b42ef4f 100644 --- a/bridgedb/geo.py +++ b/bridgedb/geo.py @@ -3,7 +3,7 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2007-2017, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """ diff --git a/bridgedb/https/distributor.py b/bridgedb/https/distributor.py index 7d9a293..4e980b7 100644 --- a/bridgedb/https/distributor.py +++ b/bridgedb/https/distributor.py @@ -5,9 +5,9 @@ # :authors: Nick Mathewson # Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # Matthew Finkel 0x017DD169EA793BE2 <sysrqb(a)torproject.org> -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2013-2015, Matthew Finkel -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2013-2017, Matthew Finkel +# (c) 2007-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information """ diff --git a/bridgedb/https/request.py b/bridgedb/https/request.py index e438044..fd80809 100644 --- a/bridgedb/https/request.py +++ b/bridgedb/https/request.py @@ -4,8 +4,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2013-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2013-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/https/server.py b/bridgedb/https/server.py index 346d81f..c785450 100644 --- a/bridgedb/https/server.py +++ b/bridgedb/https/server.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: please see included AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2013-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2013-2017, Isis Lovecruft # :license: see LICENSE for licensing information """ diff --git a/bridgedb/interfaces.py b/bridgedb/interfaces.py index 3ec01b6..d619a68 100644 --- a/bridgedb/interfaces.py +++ b/bridgedb/interfaces.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/parse/descriptors.py b/bridgedb/parse/descriptors.py index d1c4a6c..742f535 100644 --- a/bridgedb/parse/descriptors.py +++ b/bridgedb/parse/descriptors.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/parse/fingerprint.py b/bridgedb/parse/fingerprint.py index 4e3ff02..5d9e074 100644 --- a/bridgedb/parse/fingerprint.py +++ b/bridgedb/parse/fingerprint.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/parse/nickname.py b/bridgedb/parse/nickname.py index 35cf626..dcc328b 100644 --- a/bridgedb/parse/nickname.py +++ b/bridgedb/parse/nickname.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015 Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2013-2017 Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """Parsers for bridge nicknames. diff --git a/bridgedb/parse/versions.py b/bridgedb/parse/versions.py index ee62792..335e04c 100644 --- a/bridgedb/parse/versions.py +++ b/bridgedb/parse/versions.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2014-2015 Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2014-2017 Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: see included LICENSE for information """Parsers for Tor version number strings. diff --git a/bridgedb/persistent.py b/bridgedb/persistent.py index 22673dd..4410b9b 100644 --- a/bridgedb/persistent.py +++ b/bridgedb/persistent.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015 Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2013-2017 Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """Module for functionality to persistently store state.""" diff --git a/bridgedb/proxy.py b/bridgedb/proxy.py index 5b881fa..4611cf7 100644 --- a/bridgedb/proxy.py +++ b/bridgedb/proxy.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015 Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2013-2017 Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """Classes for finding and managing lists of open proxies.""" diff --git a/bridgedb/qrcodes.py b/bridgedb/qrcodes.py index e09a705..b3c4546 100644 --- a/bridgedb/qrcodes.py +++ b/bridgedb/qrcodes.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/bridgedb/runner.py b/bridgedb/runner.py index 597b1b2..4591a3a 100644 --- a/bridgedb/runner.py +++ b/bridgedb/runner.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file -# (c) 2012-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file +# (c) 2012-2017, Isis Lovecruft # :license: 3-clause BSD, see included LICENSE for information """Classes for running components and servers, as well as daemonisation. diff --git a/bridgedb/safelog.py b/bridgedb/safelog.py index 24c9768..db8e296 100644 --- a/bridgedb/safelog.py +++ b/bridgedb/safelog.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Filters for log sanitisation. diff --git a/bridgedb/schedule.py b/bridgedb/schedule.py index 6cad2dc..e962c39 100644 --- a/bridgedb/schedule.py +++ b/bridgedb/schedule.py @@ -4,8 +4,8 @@ # # :authors: Nick Mathewson # Isis Lovecruft <isis(a)torproject.org> 0xa3adb67a2cdb8b35 -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information """This module implements functions for dividing time into chunks. diff --git a/bridgedb/strings.py b/bridgedb/strings.py index e108a88..7d4b99e 100644 --- a/bridgedb/strings.py +++ b/bridgedb/strings.py @@ -3,9 +3,9 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """Commonly used string constants. diff --git a/bridgedb/translations.py b/bridgedb/translations.py index 2c9d56f..f3e6ed4 100644 --- a/bridgedb/translations.py +++ b/bridgedb/translations.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information import gettext diff --git a/bridgedb/txrecaptcha.py b/bridgedb/txrecaptcha.py index ed5891a..fc4ca2f 100644 --- a/bridgedb/txrecaptcha.py +++ b/bridgedb/txrecaptcha.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Twisted-based reCAPTCHA client. diff --git a/bridgedb/util.py b/bridgedb/util.py index 42e4664..63f508e 100644 --- a/bridgedb/util.py +++ b/bridgedb/util.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # Matthew Finkel 0x017DD169EA793BE2 <sysrqb(a)torproject.org> -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2013-2015, Matthew Finkel -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2013-2017, Matthew Finkel +# (c) 2007-2017, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Common utilities for BridgeDB.""" diff --git a/test/deprecated.py b/test/deprecated.py index 39920a2..ab7c502 100644 --- a/test/deprecated.py +++ b/test/deprecated.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """deprecated ― functions and classes which have been removed from the diff --git a/test/email_helpers.py b/test/email_helpers.py index 8d7dd49..55b8033 100644 --- a/test/email_helpers.py +++ b/test/email_helpers.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information diff --git a/test/https_helpers.py b/test/https_helpers.py index 14755ec..5c1c838 100644 --- a/test/https_helpers.py +++ b/test/https_helpers.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information diff --git a/test/test_Bucket.py b/test/test_Bucket.py index a6e335f..01f3f26 100644 --- a/test/test_Bucket.py +++ b/test/test_Bucket.py @@ -2,8 +2,8 @@ # # This file is part of BridgeDB, a Tor bridge distribution system. # -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the :mod:`bridgedb.Bucket` module. diff --git a/test/test_Main.py b/test/test_Main.py index e53256f..b157fbf 100644 --- a/test/test_Main.py +++ b/test/test_Main.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015 Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2013-2017 Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: see included LICENSE for information """Tests for :mod:`bridgedb.Main`.""" diff --git a/test/test_Tests.py b/test/test_Tests.py index 9209245..79e0daa 100644 --- a/test/test_Tests.py +++ b/test/test_Tests.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """Class wrappers to adapt BridgeDB old unittests in ``bridgedb.Tests`` diff --git a/test/test_bridgerequest.py b/test/test_bridgerequest.py index ccbf406..681d54a 100644 --- a/test/test_bridgerequest.py +++ b/test/test_bridgerequest.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/test/test_bridges.py b/test/test_bridges.py index 3c5fe0d..709ae81 100644 --- a/test/test_bridges.py +++ b/test/test_bridges.py @@ -4,8 +4,8 @@ # # :authors: Isis Lovecruft <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the :mod:`bridgedb.bridges` module.""" diff --git a/test/test_captcha.py b/test/test_captcha.py index 1000477..328a03c 100644 --- a/test/test_captcha.py +++ b/test/test_captcha.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the :mod:`bridgedb.captcha` module.""" diff --git a/test/test_configure.py b/test/test_configure.py index ebac95a..aca7c8d 100644 --- a/test/test_configure.py +++ b/test/test_configure.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: please see the AUTHORS file for attributions -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information """Tests for :mod:`bridgedb.configure`.""" diff --git a/test/test_crypto.py b/test/test_crypto.py index 5220a58..3010b5c 100644 --- a/test/test_crypto.py +++ b/test/test_crypto.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for :mod:`bridgedb.crypto`.""" diff --git a/test/test_distribute.py b/test/test_distribute.py index 95fda31..9961a05 100644 --- a/test/test_distribute.py +++ b/test/test_distribute.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/test/test_email_distributor.py b/test/test_email_distributor.py index f204d57..dd9997e 100644 --- a/test/test_email_distributor.py +++ b/test/test_email_distributor.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2015 Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017 Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: see included LICENSE for information """Tests for :mod:`bridgedb.email.distributor`.""" diff --git a/test/test_filters.py b/test/test_filters.py index 73e5685..3b9efcb 100644 --- a/test/test_filters.py +++ b/test/test_filters.py @@ -4,8 +4,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015 Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017 Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: see included LICENSE for information """Tests for :mod:`bridgedb.filters`.""" diff --git a/test/test_geo.py b/test/test_geo.py index 5e5547b..4ca6cbb 100644 --- a/test/test_geo.py +++ b/test/test_geo.py @@ -4,8 +4,8 @@ # # :authors: Isis Lovecruft <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, Isis Lovecruft # :license: see LICENSE for licensing information """Unittests for the :mod:`bridgedb.geo` module.""" diff --git a/test/test_https.py b/test/test_https.py index f47ff34..c29d6b0 100644 --- a/test/test_https.py +++ b/test/test_https.py @@ -5,8 +5,8 @@ # # :authors: trygve <tor-dev(a)lists.torproject.org> # :copyright: (c) 2014, trygve -# (c) 2014-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# (c) 2014-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/test/test_https_distributor.py b/test/test_https_distributor.py index 3c1416d..a287420 100644 --- a/test/test_https_distributor.py +++ b/test/test_https_distributor.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015 Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2013-2017 Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """Tests for :mod:`bridgedb.https.distributor`.""" diff --git a/test/test_https_request.py b/test/test_https_request.py index c39662f..c262aef 100644 --- a/test/test_https_request.py +++ b/test/test_https_request.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/test/test_https_server.py b/test/test_https_server.py index 40855fa..1880c8b 100644 --- a/test/test_https_server.py +++ b/test/test_https_server.py @@ -4,8 +4,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2014-2015, Isis Lovecruft -# (c) 2014-2015, The Tor Project, Inc. +# :copyright: (c) 2014-2017, Isis Lovecruft +# (c) 2014-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/test/test_interfaces.py b/test/test_interfaces.py index 8a78291..36f2daf 100644 --- a/test/test_interfaces.py +++ b/test/test_interfaces.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information # ____________________________________________________________________________ diff --git a/test/test_parse_descriptors.py b/test/test_parse_descriptors.py index bd3c3d5..bc565e1 100644 --- a/test/test_parse_descriptors.py +++ b/test/test_parse_descriptors.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for :class:`bridgedb.parse.descriptors` module.""" diff --git a/test/test_parse_headers.py b/test/test_parse_headers.py index 278e721..d0c038b 100644 --- a/test/test_parse_headers.py +++ b/test/test_parse_headers.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2014-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2014-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: see LICENSE for licensing information """Unittests for the :mod:`bridgedb.parse.headers` module.""" diff --git a/test/test_parse_nickname.py b/test/test_parse_nickname.py index fea000a..66c5fd5 100644 --- a/test/test_parse_nickname.py +++ b/test/test_parse_nickname.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file -# (c) 2013-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file +# (c) 2013-2017, Isis Lovecruft # :license: see LICENSE for licensing information """Unittests for the :mod:`bridgedb.parse.nickname` module.""" diff --git a/test/test_parse_options.py b/test/test_parse_options.py index c505c36..1071e90 100644 --- a/test/test_parse_options.py +++ b/test/test_parse_options.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2014-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2014-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/test/test_parse_versions.py b/test/test_parse_versions.py index becdd20..4374328 100644 --- a/test/test_parse_versions.py +++ b/test/test_parse_versions.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2014-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2014-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/test/test_proxy.py b/test/test_proxy.py index 909218d..0a69eb0 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015 Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2013-2017 Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """Tests for :mod:`bridgedb.proxy`.""" diff --git a/test/test_qrcodes.py b/test/test_qrcodes.py index 4abe8cc..8385fa0 100644 --- a/test/test_qrcodes.py +++ b/test/test_qrcodes.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2015, The Tor Project, Inc. -# (c) 2014-2015, Isis Lovecruft +# :copyright: (c) 2007-2017, The Tor Project, Inc. +# (c) 2014-2017, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/test/test_schedule.py b/test/test_schedule.py index 6a38871..1bcec07 100644 --- a/test/test_schedule.py +++ b/test/test_schedule.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2014-2015, Isis Lovecruft -# (c) 2014-2015, The Tor Project, Inc. +# :copyright: (c) 2014-2017, Isis Lovecruft +# (c) 2014-2017, The Tor Project, Inc. # :license: see LICENSE for licensing information """Unittests for the :mod:`bridgedb.schedule` module.""" diff --git a/test/test_translations.py b/test/test_translations.py index c1f0c8c..54c27a0 100644 --- a/test/test_translations.py +++ b/test/test_translations.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2014-2015, Isis Lovecruft -# (c) 2014-2015, The Tor Project, Inc. +# :copyright: (c) 2014-2017, Isis Lovecruft +# (c) 2014-2017, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information diff --git a/test/test_txrecaptcha.py b/test/test_txrecaptcha.py index 9e4f5f6..2550c3d 100644 --- a/test/test_txrecaptcha.py +++ b/test/test_txrecaptcha.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the bridgedb.txrecaptcha module.""" diff --git a/test/test_util.py b/test/test_util.py index ea5d9ee..e858861 100644 --- a/test/test_util.py +++ b/test/test_util.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2014-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2014-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: see LICENSE for licensing information """Unittests for the :mod:`bridgedb.util` module.""" diff --git a/test/util.py b/test/util.py index bd8227d..042c92d 100644 --- a/test/util.py +++ b/test/util.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013-2015, Isis Lovecruft -# (c) 2007-2015, The Tor Project, Inc. -# (c) 2007-2015, all entities within the AUTHORS file +# :copyright: (c) 2013-2017, Isis Lovecruft +# (c) 2007-2017, The Tor Project, Inc. +# (c) 2007-2017, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """Unittest utilities."""

1 0

[bridgedb/master] Add support for respecting "bridge-distribution-request" lines.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 75206116fe6f39538f522776a158ca79959a6e79 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 27 02:16:30 2017 +0000 Add support for respecting "bridge-distribution-request" lines. * CLOSES #23957: https://bugs.torproject.org/23957 --- bridgedb/Bridges.py | 65 +++++++++++++++++++++++++++++++++++++++-------------- bridgedb/Storage.py | 24 ++++++++++++++++++++ bridgedb/bridges.py | 10 +++++++++ 3 files changed, 82 insertions(+), 17 deletions(-) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index ddfb447..ac403b6 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -454,29 +454,60 @@ class BridgeSplitter(object): if not bridge.flags.running: return - # Determine which ring to put this bridge in if we haven't seen it - # before. - pos = self.hmac(bridge.identity) - n = int(pos[:8], 16) % self.totalP - pos = bisect.bisect_right(self.pValues, n) - 1 - assert 0 <= pos < len(self.rings) - ringname = self.rings[pos] - logging.info("%s placing bridge %s into hashring %s (via n=%s, pos=%s)." - % (self.__class__.__name__, bridge, ringname, n, pos)) - validRings = self.rings + self.pseudoRings + distribution_method = None + # If the bridge already has a distributor, use that. with bridgedb.Storage.getDB() as db: - ringname = db.insertBridgeAndGetRing(bridge, ringname, time.time(), - validRings) + distribution_method = db.getBridgeDistributor(bridge, validRings) + + if distribution_method: + logging.info("%s bridge %s was already in hashring %s" % + (self.__class__.__name__, bridge, distribution_method)) + else: + # Check if the bridge requested a specific distribution method. + if bridge.distribution_request: + distribution_method = bridge.distribution_request + logging.info("%s bridge %s requested placement in hashring %s" + % (self.__class__.__name__, bridge, + distribution_method)) + + # If they requested not to be distributed, honor the request: + if distribution_method == "none": + logging.info("%s bridge %s requested to not be distributed." + % (self.__class__.__name__, bridge)) + return + + # If we didn't know what they are talking about, or they requested + # "any" distribution method, and we've never seen this bridge + # before, then determine where to place it. + if ((distribution_method not in validRings) or + (distribution_method == "any")): + + pos = self.hmac(bridge.identity) + n = int(pos[:8], 16) % self.totalP + pos = bisect.bisect_right(self.pValues, n) - 1 + assert 0 <= pos < len(self.rings) + distribution_method = self.rings[pos] + logging.info(("%s placing bridge %s into hashring %s (via n=%s," + " pos=%s).") % (self.__class__.__name__, bridge, + distribution_method, n, pos)) + + with bridgedb.Storage.getDB() as db: + ringname = db.insertBridgeAndGetRing(bridge, distribution_method, + time.time(), validRings) db.commit() - # Pseudo distributors are always held in the "unallocated" ring - if ringname in self.pseudoRings: - ringname = "unallocated" + # Pseudo distributors are always held in the "unallocated" ring + if ringname in self.pseudoRings: + ringname = "unallocated" + + ring = self.ringsByName.get(ringname) + ring.insert(bridge) - ring = self.ringsByName.get(ringname) - ring.insert(bridge) + if ring is None: + logging.warn("Couldn't recognise ring named: '%s'" % ringname) + logging.info("Current rings: %s" % " ".join(self.ringsByName)) def dumpAssignments(self, f, description=""): for name,ring in self.ringsByName.iteritems(): diff --git a/bridgedb/Storage.py b/bridgedb/Storage.py index ea9d26b..4182c4b 100644 --- a/bridgedb/Storage.py +++ b/bridgedb/Storage.py @@ -145,6 +145,26 @@ class Database(object): self._cur.close() self._conn.close() + def getBridgeDistributor(self, bridge, validRings): + """If a ``bridge`` is already in the database, get its distributor. + + :rtype: None or str + :returns: The ``bridge`` distribution method, if one was + already assigned, otherwise, returns None. + """ + distribution_method = None + cur = self._cur + + cur.execute("SELECT id, distributor FROM Bridges WHERE hex_key = ?", + (bridge.fingerprint,)) + result = cur.fetchone() + + if result: + if result[1] in validRings: + distribution_method = result[1] + + return distribution_method + def insertBridgeAndGetRing(self, bridge, setRing, seenAt, validRings, defaultPool="unallocated"): '''Updates info about bridge, setting ring to setRing if none was set. @@ -175,6 +195,10 @@ class Database(object): timeToStr(seenAt), i)) return ring else: + # Check if this is currently a valid ring name. If not, move back + # into default pool. + if setRing not in validRings: + setRing = defaultPool # Insert it. cur.execute("INSERT INTO Bridges (hex_key, address, or_port, " "distributor, first_seen, last_seen) " diff --git a/bridgedb/bridges.py b/bridgedb/bridges.py index 4386d4e..8b4bc1b 100644 --- a/bridgedb/bridges.py +++ b/bridgedb/bridges.py @@ -914,6 +914,12 @@ class Bridge(BridgeBackwardsCompatibility): currently serving clients (e.g. if the Bridge hit its configured ``RelayBandwidthLimit``); ``False`` otherwise. + :vartype distribution_request: str + :ivar distribution_request: If the bridge specified a + "bridgedb-distribution-request" line in its ``@type + bridge-server-descriptor``, the requested distribution method will be + stored here. If the line was absent, this will be set to ``"any"``. + :vartype _blockedIn: dict :ivar _blockedIn: A dictionary of ``ADDRESS:PORT`` pairs to lists of lowercased, two-letter country codes (e.g. ``"us"``, ``"gb"``, @@ -963,6 +969,7 @@ class Bridge(BridgeBackwardsCompatibility): self.flags = Flags() self.hibernating = False self._blockedIn = {} + self.distribution_request = "any" self.bandwidth = None self.bandwidthAverage = None @@ -1595,6 +1602,9 @@ class Bridge(BridgeBackwardsCompatibility): self._updateORAddresses(descriptor.or_addresses) self.hibernating = descriptor.hibernating + if descriptor.bridge_distribution: + self.distribution_request = descriptor.bridge_distribution + self.onionKey = descriptor.onion_key self.ntorOnionKey = descriptor.ntor_onion_key self.signingKey = descriptor.signing_key

1 0

[bridgedb/master] Update Twisted and PyOpenSSL dependency versions, also for CI.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 0ae12639cfb045763241454c803ff0d8ded4f58d Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 21 19:13:35 2017 +0000 Update Twisted and PyOpenSSL dependency versions, also for CI. * FIXES #22998: https://bugs.torproject.org/22998 --- .travis.yml | 20 +++++++++++++------- requirements.txt | 4 ++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4717c23..9fb68f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,22 +35,28 @@ env: # https://github.com/pypa/virtualenv/issues/459 - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | sha256sum | cut -d ' ' -f 1)" matrix: - # Debian Jessie - - TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14 + # What we're running on polyanthum + - TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0 # Debian Stretch - - TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.0.0 + - TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0 + # Debian experimental (all other versions of Debian have the same dependency versions right now) + - TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=16.2.0 matrix: include: - python: "pypy" - env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14 + env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0 - python: "pypy" - env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.0.0 + env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0 allow_failures: + - python: "2.7" + env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0 + - python: "2.7" + env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=16.2.0 - python: "pypy" - env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14 + env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0 - python: "pypy" - env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.0.0 + env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0 fast_finish: true before_install: diff --git a/requirements.txt b/requirements.txt index 26c2c1a..644de6c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ Babel==0.9.6 BeautifulSoup==3.2.1 Mako==0.8.1 -Twisted==14.0.2 +Twisted==16.1.1 ipaddr==2.1.11 pycrypto==2.6.1 -pyOpenSSL==0.14 +pyOpenSSL==16.2.0 pygeoip==0.2.7 gnupg==2.0.1 pillow>=2.6.1

1 0