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

[stem/master] test_event_handling failed with python 2.6
by atagar＠torproject.org 13 May '15

13 May '15

commit 222b478200aecedf41cfcba30a14a8610f40c8f2 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 12 22:57:56 2015 -0700 test_event_handling failed with python 2.6 In python 2.6 the threading.Event object's wait() method returns None (rather than a boolean). ====================================================================== FAIL: test_event_handling ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/runner.py", line 127, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 164, in test_event_handling self.assertTrue(event_notice1.wait(10)) AssertionError ---------------------------------------------------------------------- Ran 41 tests in 22.108s --- test/integ/control/controller.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 2c977f5..84bf58a 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -161,11 +161,11 @@ class TestController(unittest.TestCase): controller.set_conf('NodeFamily', random_fingerprint()) # Wait for the event. Assert that we get it within 10 seconds - self.assertTrue(event_notice1.wait(10)) + event_notice1.wait(10) self.assertEqual(len(event_buffer1), 1) event_notice1.clear() - self.assertTrue(event_notice2.wait(10)) + event_notice2.wait(10) self.assertTrue(len(event_buffer2) >= 1) event_notice2.clear() @@ -176,7 +176,7 @@ class TestController(unittest.TestCase): buffer2_size = len(event_buffer2) controller.set_conf('NodeFamily', random_fingerprint()) - self.assertTrue(event_notice1.wait(10)) + event_notice1.wait(10) self.assertEqual(len(event_buffer1), 2) event_notice1.clear()

1 0

[stem/master] Use full tor path for pidof integ test
by atagar＠torproject.org 13 May '15

13 May '15

commit 97b7097c414577d3dcea1ee8eb104c6203f36a01 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 12 22:38:24 2015 -0700 Use full tor path for pidof integ test When running our tests with the '--tor' argument the first time we run the pidof test it passes, but further runs fail. I'm not sure why that first one passes, but in checking the later ones it's picking up our 'run_tests.py --tor /path/to/tor' since it includes tor in it. The pidof man page suggests providing an absolute path so avoiding truncation of the command for this test. ====================================================================== FAIL: test_pid_by_name_pidof ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/integ/util/system.py", line 145, in test_pid_by_name_pidof self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd)) AssertionError: 10020 != None ---------------------------------------------------------------------- Ran 26 tests in 1.435s --- test/integ/util/system.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 33fd342..1d36b5f 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -136,7 +136,7 @@ class TestSystem(unittest.TestCase): call_mock.side_effect = call_replacement tor_pid = test.runner.get_runner().get_pid() - tor_cmd = test.runner.get_runner().get_tor_command(True) + tor_cmd = test.runner.get_runner().get_tor_command() self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd)) def test_pid_by_name_ps_linux(self):

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 13 May '15

13 May '15

commit 357e798741f80ebcb7025c8ae9db05ec9076abd2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 05:15:57 2015 +0000 Update translations for torbutton-torbuttonproperties --- zh_CN/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.properties b/zh_CN/torbutton.properties index 8871ba6..385ce6c 100644 --- a/zh_CN/torbutton.properties +++ b/zh_CN/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = 本浏览器 torbutton.circuit_display.relay = 中继 torbutton.circuit_display.tor_bridge = 网桥 torbutton.circuit_display.unknown_country = 未知国家 -torbutton.content_sizer.margin_tooltip = Tor 浏览器添加此差额，使您的窗口宽度和高度总是稍有差异，从而减少人们跟踪您的在线活动的能力。 +torbutton.content_sizer.margin_tooltip = Tor 浏览器添加了这些边框，使浏览器窗口的宽高变得不再那么独特，从而让在线跟踪监视变得更难。 torbutton.panel.tooltip.disabled = 点击启用 Tor torbutton.panel.tooltip.enabled = 点击禁用 Tor torbutton.panel.plugins.disabled = 点击启用插件

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 13 May '15

13 May '15

commit 7c10b8b059a9c338a5434fa7d74fc7c3faf8c927 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 04:46:12 2015 +0000 Update translations for torbutton-aboutdialogdtd_completed --- zh_CN/aboutdialog.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/aboutdialog.dtd b/zh_CN/aboutdialog.dtd index fefa76d..af6cabb 100644 --- a/zh_CN/aboutdialog.dtd +++ b/zh_CN/aboutdialog.dtd @@ -3,12 +3,12 @@ <!ENTITY project.tpoLink "&vendorShortName;"> <!ENTITY project.end "，一个捍卫您的隐私和自由上网权的非营利组织。"> -<!ENTITY help.start "需要帮助？"> +<!ENTITY help.start "想要提供帮助？">  <!ENTITY help.donateLink "捐款"> <!ENTITY help.or "或者">  -<!ENTITY help.getInvolvedLink "入门"> +<!ENTITY help.getInvolvedLink "参与"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "有疑问？">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 13 May '15

13 May '15

commit 1625bed66a140874f5a863661cf5fa402732dc4d Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 04:46:05 2015 +0000 Update translations for torbutton-aboutdialogdtd --- zh_CN/aboutdialog.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/aboutdialog.dtd b/zh_CN/aboutdialog.dtd index fefa76d..af6cabb 100644 --- a/zh_CN/aboutdialog.dtd +++ b/zh_CN/aboutdialog.dtd @@ -3,12 +3,12 @@ <!ENTITY project.tpoLink "&vendorShortName;"> <!ENTITY project.end "，一个捍卫您的隐私和自由上网权的非营利组织。"> -<!ENTITY help.start "需要帮助？"> +<!ENTITY help.start "想要提供帮助？">  <!ENTITY help.donateLink "捐款"> <!ENTITY help.or "或者">  -<!ENTITY help.getInvolvedLink "入门"> +<!ENTITY help.getInvolvedLink "参与"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "有疑问？">

1 0

[tor-browser-spec/master] Add a scriptlet to relocate the sha256sum files.
by mikeperry＠torproject.org 13 May '15

13 May '15

commit df180672f8d5556c130844cd59b965884f158f0b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue May 12 18:30:07 2015 -0700 Add a scriptlet to relocate the sha256sum files. Also some minor tweaks and updates. --- processes/ReleaseProcess | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 925f3ce..b25764a 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -83,6 +83,18 @@ #. Sign individual bundle files: # XXX: Document + +# XXX: Temporary step to place the sha256sums-presigned-build.txt into place +# and redirect + cd $TORBROWSER_VERSION + echo "RewriteEngine On" > .htaccess + for i in sha256sums* + do + mv $i sha256sums-unsigned-build.${i:11} + echo "RewriteRule ^$i\$ sha256sums-unsigned-build.${i:11}" >> .htaccess + done + cd .. + #. Clear out old builds, transfer builds to staticiforme #. Remote: # We must use $TORBROWSER_VERSION here because signed result dirs should omit the build number suffix @@ -94,7 +106,7 @@ git pull origin eval $( ./get-tb-version release ) # or alpha / beta # We must use $TORBROWSER_VERSION here because signed result dirs should omit the build number suffix - wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~mikeperry/builds/$TORBROWSER_VERSION + wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~gk/builds/$TORBROWSER_VERSION rm $TORBROWSER_VERSION/index.html* mv $TORBROWSER_VERSION /srv/dist-master.torproject.org/htdocs/torbrowser/ chmod 775 /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION @@ -135,6 +147,10 @@ torsocks ssh staticiforme.torproject.org "static-update-component dist.torproject.org" #. Update website's torbrowser versions file to remove old versions +# NOTE: You probably want to wait some hours (12-24?) after pushing the +# update responses before doing this, so that people have a chance to see +# the Firefox notification first before their browser starts weirdly blinking +# at them. cd webwml torsocks git pull origin # Now it's time to remove the obsolete version(s)

1 0

[webwml/master] List 4.5.1 and 5.0a1 as the latest TBB versions.
by mikeperry＠torproject.org 13 May '15

13 May '15

commit 2fbf585b854a586ec7a1dfa4dbdce8034c657606 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue May 12 17:31:41 2015 -0700 List 4.5.1 and 5.0a1 as the latest TBB versions. --- include/versions.wmi | 22 +++++++++++----------- projects/torbrowser/RecommendedTBBVersions | 10 +++++++++- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 5754926..1497f04 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -19,11 +19,11 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>4.5</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>4.5</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>4.5.1</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>5.0a1</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>4.5</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>4.5</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>4.5.1</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>5.0a1</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -32,18 +32,18 @@ <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>4.5</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>4.5</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>4.5.1</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>4.5.1</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.0a1</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.0a1</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>4.5</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>4.5</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>4.5.1</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>4.5.1</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.0a1</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 5d097a6..49d2f20 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -10,5 +10,13 @@ "4.5", "4.5-Linux", "4.5-MacOS", -"4.5-Windows" +"4.5-Windows", +"4.5.1", +"4.5.1-Linux", +"4.5.1-MacOS", +"4.5.1-Windows", +"5.0a1", +"5.0a1-Linux", +"5.0a1-MacOS", +"5.0a1-Windows" ]

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 13 May '15

13 May '15

commit ddd23f6f8021eccb624bf49102cb3e8fa542d820 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 00:16:16 2015 +0000 Update translations for torbutton-abouttorproperties_completed --- fr/abouttor.properties | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/fr/abouttor.properties b/fr/abouttor.properties new file mode 100644 index 0000000..ec59d81 --- /dev/null +++ b/fr/abouttor.properties @@ -0,0 +1,21 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +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.searchDC.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 13 May '15

13 May '15

commit c66ec2f7a49beb74ba858df71d9d87966fd18712 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 00:16:13 2015 +0000 Update translations for torbutton-abouttorproperties --- fr/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/abouttor.properties b/fr/abouttor.properties index dc23e01..ec59d81 100644 --- a/fr/abouttor.properties +++ b/fr/abouttor.properties @@ -14,7 +14,7 @@ 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.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +aboutTor.searchDC.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">Disconnect.me</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above.

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 13 May '15

13 May '15

commit 38720b9f11e6700da4009f85f817b0d35ccccf83 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 00:16:09 2015 +0000 Update translations for torbutton-aboutdialogdtd_completed --- fr/aboutdialog.dtd | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/fr/aboutdialog.dtd b/fr/aboutdialog.dtd new file mode 100644 index 0000000..ddd6750 --- /dev/null +++ b/fr/aboutdialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; est développé par"> + +<!ENTITY project.tpoLink "le &vendorShortName;"> +<!ENTITY project.end ", une organisation à but non lucratif travaillant à défendre votre vie privée et liberté en ligne."> + +<!ENTITY help.start "Vous voulez aider?"> + +<!ENTITY help.donateLink "Faire une donation"> +<!ENTITY help.or "ou"> + +<!ENTITY help.getInvolvedLink "s'engager"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Des questions?"> + +<!ENTITY bottomLinks.grow "Aider le réseau Tor à grandir!"> + +<!ENTITY bottomLinks.license "Information sur les licences"> +<!ENTITY tor.TrademarkStatement ""Tor" et le "Logo Oignon" sont des marques déposés du Projet Tor, Inc.">

1 0