March 2015 - tor-commits - lists.torproject.org

[metrics-web/master] Add a question about estimated users per hour.
by karsten＠torproject.org 25 Mar '15

25 Mar '15

commit f753e4dc5b9f38463c26d6ffa5843db25c6c1a65 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Mar 25 20:11:50 2015 +0100 Add a question about estimated users per hour. --- doc/users-q-and-a.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/users-q-and-a.txt b/doc/users-q-and-a.txt index 537ef06..e6bf74f 100644 --- a/doc/users-q-and-a.txt +++ b/doc/users-q-and-a.txt @@ -24,6 +24,13 @@ over the day, or what? A: Average number of concurrent users, estimated from data collected over a day. We can't say how many distinct users there are. +Q: Are there more fine-grained numbers available, for example, on the +number of users per hour? +A: No, the relays that report these statistics aggregate requests by +country of origin and over a period of 24 hours. The statistics we would +need to gather for the number of users per hour would be too detailed and +might put users at risk. + Q: Are these tor clients or users? What if there's more than one user behind a tor client? A: Then we count those users as one. We really count clients, but it's

1 0

[bridgedb/master] Add better checks for vanilla IPv4 bridge lines in test_https.py.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 414e6a577441a3ceaa207ccb771b839370ff456c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:13:54 2015 +0000 Add better checks for vanilla IPv4 bridge lines in test_https.py. --- lib/bridgedb/test/test_https.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index fe9e4e3..6a40a67 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -24,6 +24,7 @@ repository. from __future__ import print_function +import ipaddr import mechanize import os @@ -211,8 +212,9 @@ class HTTPTests(unittest.TestCase): captchaResponse=CAPTCHA_RESPONSE) bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) for bridge in bridges: - # TODO: do more interesting checks self.assertTrue(bridge != None) + addr = bridge[0].rsplit(':', 1)[0] + self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv4Address) def test_get_scramblesuit_ipv4(self): if os.environ.get("CI"):

1 0

[bridgedb/master] Add test for vanilla IPv6 addresses in test_https.py.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit c1a3d4692270b592a3a2efb7d5a14af357f6f91c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:14:57 2015 +0000 Add test for vanilla IPv6 addresses in test_https.py. --- lib/bridgedb/test/test_https.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 6a40a67..92b07bf 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -216,6 +216,29 @@ class HTTPTests(unittest.TestCase): addr = bridge[0].rsplit(':', 1)[0] self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv4Address) + def test_get_vanilla_ipv6(self): + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") + else: + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) + + self.openBrowser() + self.goToOptionsPage() + + PT = '0' + soup = self.submitOptions(transport=PT, ipv6=True, + captchaResponse=CAPTCHA_RESPONSE) + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) + for bridge in bridges: + self.assertTrue(bridge != None) + addr = bridge[0].rsplit(':', 1)[0].strip('[]') + self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv6Address) + def test_get_scramblesuit_ipv4(self): if os.environ.get("CI"): if not self.pid or not processExists(self.pid):

1 0

[bridgedb/master] Fix BridgeRequestBase.addressClass check.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 8507fa30378e85e90b71b54de2bcb2f9537936f4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:32:04 2015 +0000 Fix BridgeRequestBase.addressClass check. * CHANGE `bridgedb.bridgerequest.BridgeRequestBase.__init__()` to check that the `addressClass` *is* either an `ipaddr.IPv4Address` or an `ipaddr.IPv6Address`, rather than checking if `addressClass` is an instance of one of those classes. * FIXES #14065: https://bugs.torproject.org/14065. --- lib/bridgedb/bridgerequest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index d7b4d18..320074a 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -88,8 +88,8 @@ class BridgeRequestBase(object): def __init__(self, addressClass=None): self.addressClass = addressClass - if not isinstance(self.addressClass, - (ipaddr.IPv4Address, ipaddr.IPv6Address)): + if not ((self.addressClass is ipaddr.IPv4Address) or + (self.addressClass is ipaddr.IPv6Address)): self.addressClass = ipaddr.IPv4Address self.filters = list() self.transports = list()

1 0

[bridgedb/master] Revert back to using Bridge.getID() in filterAssignBridgesToRing().
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 332ca3fb678bf47ec3fdb100ac6dea6081a37b6e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 01:41:02 2015 +0000 Revert back to using Bridge.getID() in filterAssignBridgesToRing(). Bridge.getID() returns the Bridge's identity key digest in binary, and Bridge.fingerprint return the digest in hexadecimal. While this is not a bug, we should avoid randomly changing the encoding used to assign Bridges to hashrings, as it might result in e.g. a Bridge which was previously assigned to hashing 0 based on the binary digest getting a duplicate assignment in hashring 1 based on the hexadecimal-encoded digest. * REVERT change made in 6015cc35 to the encoding of Bridge identity key digest used for assigning a Bridge to a hashring. --- lib/bridgedb/Filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index b7bac87..d96d3ec 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -18,7 +18,7 @@ def filterAssignBridgesToRing(hmac, numRings, assignedRing): return funcs[ruleset] except KeyError: def _assignBridgesToRing(bridge): - digest = hmac(bridge.fingerprint) + digest = hmac(bridge.getID()) pos = long( digest[:8], 16 ) which = pos % numRings

1 0

[bridgedb/master] Merge branch 'fix/14065-vanilla-ipv6' into develop
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 481d36868e8c1e5a430b82ccd1d17ecfb0ed0837 Merge: 332ca3f 0449560 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 01:52:38 2015 +0000 Merge branch 'fix/14065-vanilla-ipv6' into develop lib/bridgedb/bridgerequest.py | 4 ++-- lib/bridgedb/bridges.py | 4 +++- lib/bridgedb/test/test_https.py | 23 +++++++++++++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-)

1 0

[bridgedb/master] Log whether a Bridge is attempting to answer a request for IPv6 or IPv4.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 0449560f737fb71fb2fafe8691f018dc9cc6d362 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:40:21 2015 +0000 Log whether a Bridge is attempting to answer a request for IPv6 or IPv4. --- lib/bridgedb/bridges.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index b791730..96f995e 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1038,7 +1038,9 @@ class Bridge(BridgeBackwardsCompatibility): return a :term:`Bridge Line` for the requested pluggable transport type. """ - logging.info("Bridge %s answering request for vanilla address..." % self) + logging.info( + "Bridge %s answering request for IPv%s vanilla address..." % + (self, "6" if bridgeRequest.addressClass is ipaddr.IPv6Address else "4")) if not bridgeRequest.filters: logging.debug(("Request %s didn't have any filters; "

1 0

[bridgedb/master] Remove the need for the recaptcha-client dependency.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 032ac80ad1f14e3a47a0c28a0e5fff1a787e8c8e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 01:24:47 2015 +0000 Remove the need for the recaptcha-client dependency. --- lib/bridgedb/txrecaptcha.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/txrecaptcha.py b/lib/bridgedb/txrecaptcha.py index 96b288c..a8a0532 100644 --- a/lib/bridgedb/txrecaptcha.py +++ b/lib/bridgedb/txrecaptcha.py @@ -25,9 +25,6 @@ which are copyright the authors of the recaptcha-client_ package. import logging import urllib -from recaptcha.client.captcha import API_SSL_SERVER -from recaptcha.client.captcha import RecaptchaResponse -from recaptcha.client.captcha import displayhtml from twisted import version as _twistedversion from twisted.internet import defer @@ -44,7 +41,8 @@ from zope.interface import implements from bridgedb.crypto import SSLVerifyingContextFactory -API_SERVER = API_SSL_SERVER +#: This was taken from recaptcha.client.captcha.API_SSL_SERVER. +API_SSL_SERVER = API_SERVER = "https://www.google.com/recaptcha/api" API_SSL_VERIFY_URL = "%s/verify" % API_SSL_SERVER # `t.w.client.HTTPConnectionPool` isn't available in Twisted-12.0.0 (see @@ -107,6 +105,15 @@ class RecaptchaResponseError(ValueError): """There was an error with the reCaptcha API server's response.""" +class RecaptchaResponse(object): + """Taken from recaptcha.client.captcha.`RecaptchaResponse`_. + .. RecaptchaResponse: https://code.google.com/p/recaptcha/source/browse/trunk/recaptcha-plugins/p… + """ + def __init__(self, is_valid, error_code=None): + self.is_valid = is_valid + self.error_code = error_code + + class RecaptchaResponseProtocol(protocol.Protocol): """HTML parser which creates a :class:`RecaptchaResponse` from the body of the reCaptcha API server's response.

1 0

[bridgedb/master] Add a module docstring to bridgedb.txrecaptcha.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 32194b8575b6a0781a164d0c9527a025a754f0ce Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 01:22:51 2015 +0000 Add a module docstring to bridgedb.txrecaptcha. --- lib/bridgedb/txrecaptcha.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/bridgedb/txrecaptcha.py b/lib/bridgedb/txrecaptcha.py index 477e112..96b288c 100644 --- a/lib/bridgedb/txrecaptcha.py +++ b/lib/bridgedb/txrecaptcha.py @@ -7,6 +7,20 @@ # (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information +"""Twisted-based reCAPTCHA client. + +This client *always* uses TLS with strict hostname checking, unlike the +official Google Python recaptcha-client_, which is harcoded_ to use plaintext +HTTP. + +Small portions of this code were taken from the official Google Python +recaptcha-client_ module, version 1.0.6. Those portions are +:class:`RecaptchaResponse`, :data:`API_SERVER`, They total 5 lines of code, +which are copyright the authors of the recaptcha-client_ package. + +.. _hardcoded: https://code.google.com/p/recaptcha/source/browse/trunk/recaptcha-plugins/p… +.. _recaptcha-client: https://pypi.python.org/pypi/recaptcha-client/1.0.6 +""" import logging import urllib

1 0

[bridgedb/master] Update copyrights to 2015.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit c7292d86fde81a3d8f8cb7a8ad80dea4df3f061c Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 24 01:39:20 2015 +0000 Update copyrights to 2015. --- lib/bridgedb/Bridges.py | 2 +- lib/bridgedb/Dist.py | 6 +++--- lib/bridgedb/HTTPServer.py | 4 ++-- lib/bridgedb/Main.py | 8 ++++---- lib/bridgedb/bridgerequest.py | 4 ++-- lib/bridgedb/bridges.py | 4 ++-- lib/bridgedb/captcha.py | 6 +++--- lib/bridgedb/configure.py | 8 ++++---- lib/bridgedb/crypto.py | 6 +++--- lib/bridgedb/email/autoresponder.py | 4 ++-- lib/bridgedb/email/dkim.py | 4 ++-- lib/bridgedb/email/request.py | 4 ++-- lib/bridgedb/email/server.py | 4 ++-- lib/bridgedb/email/templates.py | 4 ++-- lib/bridgedb/interfaces.py | 4 ++-- lib/bridgedb/parse/descriptors.py | 4 ++-- lib/bridgedb/parse/fingerprint.py | 4 ++-- lib/bridgedb/parse/nickname.py | 6 +++--- lib/bridgedb/parse/versions.py | 6 +++--- lib/bridgedb/runner.py | 5 +++-- lib/bridgedb/safelog.py | 4 ++-- lib/bridgedb/schedule.py | 4 ++-- lib/bridgedb/strings.py | 8 ++++++++ lib/bridgedb/test/deprecated.py | 6 +++--- lib/bridgedb/test/deprecated_networkstatus.py | 6 +++--- lib/bridgedb/test/test_Bucket.py | 4 ++-- lib/bridgedb/test/test_HTTPServer.py | 4 ++-- lib/bridgedb/test/test_bridgerequest.py | 4 ++-- lib/bridgedb/test/test_bridges.py | 4 ++-- lib/bridgedb/test/test_captcha.py | 4 ++-- lib/bridgedb/test/test_configure.py | 4 ++-- lib/bridgedb/test/test_crypto.py | 6 +++--- lib/bridgedb/test/test_https.py | 5 +++-- lib/bridgedb/test/test_parse_descriptors.py | 4 ++-- lib/bridgedb/test/test_parse_headers.py | 6 +++--- lib/bridgedb/test/test_parse_options.py | 4 ++-- lib/bridgedb/test/test_parse_versions.py | 4 ++-- lib/bridgedb/test/test_schedule.py | 4 ++-- lib/bridgedb/test/test_translations.py | 4 ++-- lib/bridgedb/test/test_txrecaptcha.py | 4 ++-- lib/bridgedb/test/test_util.py | 6 +++--- lib/bridgedb/translations.py | 4 ++-- lib/bridgedb/txrecaptcha.py | 4 ++-- lib/bridgedb/util.py | 6 +++--- 44 files changed, 110 insertions(+), 100 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index bdb911a..078cfff 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/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-2014, The Tor Project, Inc. +# :copyright: (c) 2007-2015, 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/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index df1ce5b..20f27bc 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.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-2014, Isis Lovecruft -# (c) 2013-2014, Matthew Finkel -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2013-2015, Matthew Finkel +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """This module has functions to decide which bridges to hand out to whom.""" diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 258861e..ae86957 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.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-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information """ diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index d0698c0..45908c7 100644 --- a/lib/bridgedb/Main.py +++ b/lib/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-2014, Isis Lovecruft -# (c) 2013-2014, Matthew Finkel -# (c) 2007-2014, Nick Mathewson -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2013-2015, Matthew Finkel +# (c) 2007-2015, Nick Mathewson +# (c) 2007-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information """This module sets up BridgeDB and starts the servers running.""" diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index 320074a..ff8e289 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 96f995e..86123b2 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/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-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information """Classes for manipulating and storing Bridges and their attributes.""" diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 758c1f3..234bbb4 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/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-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index 55fcba5..90c5e2f 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.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-2014, Isis Lovecruft -# (c) 2013-2014, Matthew Finkel -# (c) 2007-2014, Nick Mathewson -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2013-2015, Matthew Finkel +# (c) 2007-2015, Nick Mathewson +# (c) 2007-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information """Utilities for dealing with configuration files for BridgeDB.""" diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index d6dbbad..7785073 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/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-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """BridgeDB general cryptographic utilities. diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 726856c..80ad83d 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/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-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/email/dkim.py b/lib/bridgedb/email/dkim.py index d797dbc..d1075aa 100644 --- a/lib/bridgedb/email/dkim.py +++ b/lib/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-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/email/request.py b/lib/bridgedb/email/request.py index cd7b47d..9c0f0c2 100644 --- a/lib/bridgedb/email/request.py +++ b/lib/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-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 05cecb7..cde4637 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/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-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/email/templates.py b/lib/bridgedb/email/templates.py index dda9f65..e81283e 100644 --- a/lib/bridgedb/email/templates.py +++ b/lib/bridgedb/email/templates.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/interfaces.py b/lib/bridgedb/interfaces.py index b8a1e16..38c3541 100644 --- a/lib/bridgedb/interfaces.py +++ b/lib/bridgedb/interfaces.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index ea7bea8..efdedc9 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/parse/fingerprint.py b/lib/bridgedb/parse/fingerprint.py index 900fc06..f825271 100644 --- a/lib/bridgedb/parse/fingerprint.py +++ b/lib/bridgedb/parse/fingerprint.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/parse/nickname.py b/lib/bridgedb/parse/nickname.py index 8f4abea..35cf626 100644 --- a/lib/bridgedb/parse/nickname.py +++ b/lib/bridgedb/parse/nickname.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013 Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2013-2015 Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """Parsers for bridge nicknames. diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index 1d05ae1..8140357 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2014 Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2014-2015 Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: see included LICENSE for information """Parsers for Tor version number strings. diff --git a/lib/bridgedb/runner.py b/lib/bridgedb/runner.py index 9bc5d5b..7be7700 100644 --- a/lib/bridgedb/runner.py +++ b/lib/bridgedb/runner.py @@ -4,8 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file +# (c) 2012-2015, Isis Lovecruft # :license: 3-clause BSD, see included LICENSE for information """Classes for running components and servers, as well as daemonisation. diff --git a/lib/bridgedb/safelog.py b/lib/bridgedb/safelog.py index eb6810b..8130be6 100644 --- a/lib/bridgedb/safelog.py +++ b/lib/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-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Filters for log sanitisation. diff --git a/lib/bridgedb/schedule.py b/lib/bridgedb/schedule.py index 71b4254..6757343 100644 --- a/lib/bridgedb/schedule.py +++ b/lib/bridgedb/schedule.py @@ -4,8 +4,8 @@ # # :authors: Nick Mathewson # Isis Lovecruft <isis(a)torproject.org> 0xa3adb67a2cdb8b35 -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information """This module implements functions for dividing time into chunks.""" diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index a9a06bc..5a9c528 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -1,4 +1,12 @@ # -*- coding: utf-8 -*- +# +# 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 +# :license: 3-clause BSD, see included LICENSE for information from __future__ import unicode_literals diff --git a/lib/bridgedb/test/deprecated.py b/lib/bridgedb/test/deprecated.py index 0cf01fb..181814c 100644 --- a/lib/bridgedb/test/deprecated.py +++ b/lib/bridgedb/test/deprecated.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013, Isis Lovecruft -# (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, 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/lib/bridgedb/test/deprecated_networkstatus.py b/lib/bridgedb/test/deprecated_networkstatus.py index 7e3b0a4..41d8c5f 100644 --- a/lib/bridgedb/test/deprecated_networkstatus.py +++ b/lib/bridgedb/test/deprecated_networkstatus.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013 Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2013-2015 Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """Parsers for bridge networkstatus descriptors. diff --git a/lib/bridgedb/test/test_Bucket.py b/lib/bridgedb/test/test_Bucket.py index fa3bb7e..a6e335f 100644 --- a/lib/bridgedb/test/test_Bucket.py +++ b/lib/bridgedb/test/test_Bucket.py @@ -2,8 +2,8 @@ # # This file is part of BridgeDB, a Tor bridge distribution system. # -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, 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/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index fccbee8..ee6e588 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.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, Isis Lovecruft -# (c) 2014, The Tor Project, Inc. +# :copyright: (c) 2014-2015, Isis Lovecruft +# (c) 2014-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/test/test_bridgerequest.py b/lib/bridgedb/test/test_bridgerequest.py index 24dcad2..b4da71b 100644 --- a/lib/bridgedb/test/test_bridgerequest.py +++ b/lib/bridgedb/test/test_bridgerequest.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index d42fb24..4388437 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -4,8 +4,8 @@ # # :authors: Isis Lovecruft <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, 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/lib/bridgedb/test/test_captcha.py b/lib/bridgedb/test/test_captcha.py index a5083d7..1000477 100644 --- a/lib/bridgedb/test/test_captcha.py +++ b/lib/bridgedb/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-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the :mod:`bridgedb.captcha` module.""" diff --git a/lib/bridgedb/test/test_configure.py b/lib/bridgedb/test/test_configure.py index 501ed1f..ebac95a 100644 --- a/lib/bridgedb/test/test_configure.py +++ b/lib/bridgedb/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-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information """Tests for :mod:`bridgedb.configure`.""" diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index c2010ca..9fb0448 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013, Isis Lovecruft -# (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for :mod:`bridgedb.crypto`.""" diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 92b07bf..1e0c778 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -3,8 +3,9 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: trygve <tor-dev(a)lists.torproject.org> -# :copyright: (c) trygve -# (c) 2014, The Tor Project, Inc. +# :copyright: (c) 2014, trygve +# (c) 2014-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 2336a24..aa3b662 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/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-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for :class:`bridgedb.parse.descriptors` module.""" diff --git a/lib/bridgedb/test/test_parse_headers.py b/lib/bridgedb/test/test_parse_headers.py index ddcf66f..278e721 100644 --- a/lib/bridgedb/test/test_parse_headers.py +++ b/lib/bridgedb/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, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2014-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: see LICENSE for licensing information """Unittests for the :mod:`bridgedb.parse.headers` module.""" diff --git a/lib/bridgedb/test/test_parse_options.py b/lib/bridgedb/test/test_parse_options.py index fc76904..c505c36 100644 --- a/lib/bridgedb/test/test_parse_options.py +++ b/lib/bridgedb/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, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2014-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/test/test_parse_versions.py b/lib/bridgedb/test/test_parse_versions.py index 3b2e392..becdd20 100644 --- a/lib/bridgedb/test/test_parse_versions.py +++ b/lib/bridgedb/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, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2014-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/test/test_schedule.py b/lib/bridgedb/test/test_schedule.py index 178e3e4..d7fc9c1 100644 --- a/lib/bridgedb/test/test_schedule.py +++ b/lib/bridgedb/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, Isis Lovecruft -# (c) 2014, The Tor Project, Inc. +# :copyright: (c) 2014-2015, Isis Lovecruft +# (c) 2014-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information """Unittests for the :mod:`bridgedb.schedule` module.""" diff --git a/lib/bridgedb/test/test_translations.py b/lib/bridgedb/test/test_translations.py index ee15ac4..442338a 100644 --- a/lib/bridgedb/test/test_translations.py +++ b/lib/bridgedb/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, Isis Lovecruft -# (c) 2014, The Tor Project, Inc. +# :copyright: (c) 2014-2015, Isis Lovecruft +# (c) 2014-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information diff --git a/lib/bridgedb/test/test_txrecaptcha.py b/lib/bridgedb/test/test_txrecaptcha.py index 81484dc..4704d49 100644 --- a/lib/bridgedb/test/test_txrecaptcha.py +++ b/lib/bridgedb/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-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the bridgedb.txrecaptcha module.""" diff --git a/lib/bridgedb/test/test_util.py b/lib/bridgedb/test/test_util.py index 272c5b7..da4ddf4 100644 --- a/lib/bridgedb/test/test_util.py +++ b/lib/bridgedb/test/test_util.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2014-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: see LICENSE for licensing information """Unittests for the :mod:`bridgedb.util` module.""" diff --git a/lib/bridgedb/translations.py b/lib/bridgedb/translations.py index 3085938..2c9d56f 100644 --- a/lib/bridgedb/translations.py +++ b/lib/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-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information import gettext diff --git a/lib/bridgedb/txrecaptcha.py b/lib/bridgedb/txrecaptcha.py index 779e00e..477e112 100644 --- a/lib/bridgedb/txrecaptcha.py +++ b/lib/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-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index ca2a88f..f3d87bd 100644 --- a/lib/bridgedb/util.py +++ b/lib/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-2014, Isis Lovecruft -# (c) 2013-2014, Matthew Finkel -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2013-2015, Matthew Finkel +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Common utilities for BridgeDB."""

1 0