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

[bridgedb/master] Add unittests for SQL to determine which distributor to allocate to.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 48d4562f544c0635e0ce75a4151a68ff10c6908f Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 27 23:30:24 2017 +0000 Add unittests for SQL to determine which distributor to allocate to. --- bridgedb/test/test_Storage.py | 69 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/bridgedb/test/test_Storage.py b/bridgedb/test/test_Storage.py index 8b0affd..dffba2b 100644 --- a/bridgedb/test/test_Storage.py +++ b/bridgedb/test/test_Storage.py @@ -1,17 +1,23 @@ #!/usr/bin/env python """Unittests for the :mod:`bridgedb.Storage` module.""" +import os +import threading +import time + from twisted.python import log from twisted.trial import unittest -import bridgedb.Storage as Storage from twisted.internet import reactor from twisted.internet.threads import deferToThread -import os -import threading -from time import sleep + +import bridgedb.Storage as Storage + +from bridgedb.test.util import generateFakeBridges class DatabaseTest(unittest.TestCase): def setUp(self): + self.fakeBridges = generateFakeBridges() + self.validRings = ['https', 'unallocated', 'email', 'moat'] self.dbfname = 'test-bridgedb.sqlite' Storage.setDBFilename(self.dbfname) @@ -22,7 +28,7 @@ class DatabaseTest(unittest.TestCase): def _runAndDie(self, timeout, func): with func(): - sleep(timeout) + time.sleep(timeout) def _cb_assertTrue(self, result): self.assertTrue(result) @@ -54,3 +60,56 @@ class DatabaseTest(unittest.TestCase): d2.addCallback(self._cb_assertFalse) d2.addErrback(self._eb_Failure) d2.addCallback(self._cb_assertTrue, Storage.getDB(False)) + + def test_insertBridgeAndGetRing_new_bridge(self): + bridge = self.fakeBridges[0] + Storage.initializeDBLock() + with Storage.getDB() as db: + ringname = db.insertBridgeAndGetRing(bridge, 'moat', + time.time(), + self.validRings) + self.assertIn(ringname, self.validRings) + + def test_insertBridgeAndGetRing_already_seen_bridge(self): + bridge = self.fakeBridges[0] + Storage.initializeDBLock() + with Storage.getDB() as db: + ringname = db.insertBridgeAndGetRing(bridge, 'moat', + time.time(), + self.validRings) + self.assertIn(ringname, self.validRings) + ringname = db.insertBridgeAndGetRing(bridge, 'https', + time.time(), + self.validRings) + self.assertIn(ringname, self.validRings) + self.assertEqual(ringname, 'moat') + + def test_getBridgeDistributor_recognised(self): + bridge = self.fakeBridges[0] + Storage.initializeDBLock() + with Storage.getDB() as db: + ringname = db.insertBridgeAndGetRing(bridge, 'moat', + time.time(), + self.validRings) + self.assertIn(ringname, self.validRings) + self.assertEqual(ringname, 'moat') + db.commit() + + with Storage.getDB() as db: + ringname = db.getBridgeDistributor(bridge, self.validRings) + self.assertEqual(ringname, 'moat') + + def test_getBridgeDistributor_unrecognised(self): + bridge = self.fakeBridges[0] + Storage.initializeDBLock() + with Storage.getDB() as db: + ringname = db.insertBridgeAndGetRing(bridge, 'godzilla', + time.time(), + self.validRings) + self.assertIn(ringname, self.validRings) + self.assertEqual(ringname, "unallocated") + db.commit() + + with Storage.getDB() as db: + ringname = db.getBridgeDistributor(bridge, self.validRings) + self.assertEqual(ringname, "unallocated")

1 0

[bridgedb/master] Bump stem version to support bridge-distribution-request lines.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit d1354e56edf9303c62df65c0a38d060da8b6feb6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Oct 26 22:42:07 2017 +0000 Bump stem version to support bridge-distribution-request lines. --- .travis.requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 0c1dc95..de5e58a 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -28,5 +28,5 @@ gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 service_identity==14.0.0 -git+https://git.torproject.org/stem.git@ba8cee36a0348c1509ad3562051723b7948e19ce#egg=stem-1.4.1.dev0-py2.7 +git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7 zope.interface==3.6.1 diff --git a/requirements.txt b/requirements.txt index 644de6c..f60d817 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,5 @@ gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 service_identity==14.0.0 -git+https://git.torproject.org/stem.git@152fa89c33114619913d2be13e67adb4e55ce7ab#egg=stem-1.4.1.dev1-py2.7 +git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7 zope.interface==3.6.1

1 0

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

28 Oct '17

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

1 0

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

28 Oct '17

commit 9de09766c0c4fedea2db328a80fb7ecf8f7fd43e Merge: f824063 0ae1263 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 25 22:54:32 2017 +0000 Merge branch 'fix/22998' into develop .travis.yml | 20 +++++++++++++------- requirements.txt | 4 ++-- 2 files changed, 15 insertions(+), 9 deletions(-)

1 0

[bridgedb/master] 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/master] Bump leekspin version to 2.2.0.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 163db1e141bd42601f4b05c50f609cfc0b17a760 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Oct 26 23:02:20 2017 +0000 Bump leekspin version to 2.2.0. --- .test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index f48bba3..6a85c00 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -6,7 +6,7 @@ # $ make coverage # coverage==4.2 -leekspin==1.1.4 +git+https://git.torproject.org/user/isis/leekspin.git@bad0bed11a9018f65555b3c6998b26e2cb06f5b5#egg=leekspin-2.2.0.dev1-py2.7 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/.travis.requirements.txt b/.travis.requirements.txt index de5e58a..092d4f2 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ coverage==4.2 coveralls==0.4.2 -leekspin==1.1.4 +git+https://git.torproject.org/user/isis/leekspin.git@bad0bed11a9018f65555b3c6998b26e2cb06f5b5#egg=leekspin-2.2.0.dev1-py2.7 mechanize==0.2.5 sure==1.2.2 Babel==0.9.6

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 27 Oct '17

27 Oct '17

commit 1a796fecc441702de9e874685b0d711bb87d2b9d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 27 23:50:36 2017 +0000 Update translations for tor-browser-manual --- nl_BE/nl_BE.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nl_BE/nl_BE.po b/nl_BE/nl_BE.po index c85d17b47..2959987ce 100644 --- a/nl_BE/nl_BE.po +++ b/nl_BE/nl_BE.po @@ -1,11 +1,12 @@ # Translators: # Katrien Igodt <kigodt(a)gmail.com>, 2016 +# Joren Vandeweyer <jorenvandeweyer(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Katrien Igodt <kigodt(a)gmail.com>, 2016\n" +"Last-Translator: Joren Vandeweyer <jorenvandeweyer(a)gmail.com>, 2017\n" "Language-Team: Dutch (Belgium) (https://www.transifex.com/otf/teams/1519/nl_BE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -491,7 +492,7 @@ msgstr "" #: index.page:6 msgid "Tor Browser User Manual" -msgstr "" +msgstr "Tor Browser gebruikshandleiding" #: known-issues.page:6 msgid "A list of known issues."

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 27 Oct '17

27 Oct '17

commit b9d7c860d57fa5c4bafd205f3533e05fcf2d8e89 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 27 23:48:37 2017 +0000 Update translations for torbutton-abouttorproperties_completed --- nl_BE/abouttor.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nl_BE/abouttor.properties b/nl_BE/abouttor.properties index 157214c3e..e3612fa98 100644 --- a/nl_BE/abouttor.properties +++ b/nl_BE/abouttor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Zoek<a href="%1$S">veilig</a> met<a href="%2$S">DuckD aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Doneer nu! + +aboutTor.donationBanner.slogan=Tor: Digitale tegenspraak aanmoedigen +aboutTor.donationBanner.mozilla=Geef vandaag en Mozilla zal u gift koppelen! + +aboutTor.donationBanner.tagline1=Beschermen van Journalisten, Whistleblowers, & Activisten sinds 2006 +aboutTor.donationBanner.tagline2=Wereldwijde Netwerk Vrijheid +aboutTor.donationBanner.tagline3=Online Vrijheid +aboutTor.donationBanner.tagline4=Bevorderen van gratis wereldwijde vrije mening +aboutTor.donationBanner.tagline5=Bescherming van de privacy van miljoenen elke dag

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 27 Oct '17

27 Oct '17

commit 9b6b6c2379f17065586aa983aa247a33d8fc3ba2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 27 23:48:32 2017 +0000 Update translations for torbutton-abouttorproperties --- nl_BE/abouttor.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nl_BE/abouttor.properties b/nl_BE/abouttor.properties index 8936055a0..e3612fa98 100644 --- a/nl_BE/abouttor.properties +++ b/nl_BE/abouttor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Doneer nu! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Digitale tegenspraak aanmoedigen +aboutTor.donationBanner.mozilla=Geef vandaag en Mozilla zal u gift koppelen! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=Beschermen van Journalisten, Whistleblowers, & Activisten sinds 2006 +aboutTor.donationBanner.tagline2=Wereldwijde Netwerk Vrijheid +aboutTor.donationBanner.tagline3=Online Vrijheid +aboutTor.donationBanner.tagline4=Bevorderen van gratis wereldwijde vrije mening +aboutTor.donationBanner.tagline5=Bescherming van de privacy van miljoenen elke dag

1 0

[translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
by translation＠torproject.org 27 Oct '17

27 Oct '17

commit 712e8a952d2d3a0443d53439c3a39b7fe16efa5d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 27 23:47:25 2017 +0000 Update translations for torbutton-brandproperties_completed --- nl_BE/brand.properties | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nl_BE/brand.properties b/nl_BE/brand.properties new file mode 100644 index 000000000..f4aa65987 --- /dev/null +++ b/nl_BE/brand.properties @@ -0,0 +1,16 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShorterName=Tor Browser +brandShortName=Tor Browser +brandFullName=Tor Browser +vendorShortName=Tor Project + +homePageSingleStartMain=Firefox Start, een snelle startpagina met ingebouwde zoekfunctie +homePageImport=Importeer uw startpagina uit %S + +homePageMigrationPageTitle=Startpagina keuze +homePageMigrationDescription=Selecteer de startpagina die je wil gebruiken: + +syncBrandShortName=Synchroniseer

1 0