- tor-commits - lists.torproject.org

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 20 Feb '12

20 Feb '12

commit 30496d1aa81928f32bdd9f15f9fbf33edf14e4ce Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 20 08:45:34 2012 +0000 Update translations for vidalia_help_completed --- eu/index.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/index.po b/eu/index.po index 8ec32ed..3f3d971 100644 --- a/eu/index.po +++ b/eu/index.po @@ -1,12 +1,12 @@ # # Translators: -# <baldarra(a)euskalerria.org>, 2011. +# <baldarra(a)euskalerria.org>, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2012-02-14 10:02+0000\n" +"PO-Revision-Date: 2012-02-20 08:32+0000\n" "Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/index.html:16 msgid "Vidalia Help" -msgstr "Laguntza" +msgstr "Vidaliaren Laguntza" #. type: Content of: <html><body><p> #: en/index.html:20

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 20 Feb '12

20 Feb '12

commit 95ad4ed43f04e1688e55467861f9b31c55887a39 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 20 08:45:28 2012 +0000 Update translations for vidalia_help --- eu/index.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/index.po b/eu/index.po index 8ec32ed..3f3d971 100644 --- a/eu/index.po +++ b/eu/index.po @@ -1,12 +1,12 @@ # # Translators: -# <baldarra(a)euskalerria.org>, 2011. +# <baldarra(a)euskalerria.org>, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2012-02-14 10:02+0000\n" +"PO-Revision-Date: 2012-02-20 08:32+0000\n" "Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/index.html:16 msgid "Vidalia Help" -msgstr "Laguntza" +msgstr "Vidaliaren Laguntza" #. type: Content of: <html><body><p> #: en/index.html:20

1 0

[stem/master] Fixing another close() deadlock issue
by atagar＠torproject.org 20 Feb '12

20 Feb '12

commit be32e6a5017b220643ee4df4aace3d81a6acdd73 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 19 16:33:42 2012 -0800 Fixing another close() deadlock issue The previous fix narrowed the window where close() / recv() calls could trigger deadlock, but it didn't eliminate it. I'm adding another test that reliably triggered deadlock in that case and narrowing the window even more (which fixed the issue). I'm a little worried that this doesn't completely eliminate the issue since there is a theoretical race if recv() calls close after someone else calls close() but before they set the boolean flag. That said, I'm not sure if this is really an issue in practice. --- stem/socket.py | 3 +- test/integ/control/base_controller.py | 34 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index afea436..7f15df6 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -202,12 +202,13 @@ class ControlSocket: Shuts down the socket. If it's already closed then this is a no-op. """ + self._handling_close = True + with self._send_lock: # Function is idempotent with one exception: we notify _close() if this # is causing our is_alive() state to change. is_change = self.is_alive() - self._handling_close = True if self._socket: # if we haven't yet established a connection then this raises an error diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py index 4c6260d..da4cc08 100644 --- a/test/integ/control/base_controller.py +++ b/test/integ/control/base_controller.py @@ -4,6 +4,7 @@ Integration tests for the stem.control.BaseController class. import time import unittest +import threading import stem.control import stem.socket @@ -101,6 +102,39 @@ class TestBaseController(unittest.TestCase): response = controller.msg("GETINFO blarg") self.assertEquals('Unrecognized key "blarg"', str(response)) + def test_msg_repeatedly(self): + """ + Connects, sends a burst of messages, and closes the socket repeatedly. This + is a simple attempt to trigger concurrency issues. + """ + + with test.runner.get_runner().get_tor_socket() as control_socket: + controller = stem.control.BaseController(control_socket) + + def run_getinfo(): + for i in xrange(150): + try: + controller.msg("GETINFO version") + controller.msg("GETINFO blarg") + controller.msg("blarg") + except stem.socket.ControllerError: + pass + + message_threads = [] + + for i in xrange(5): + msg_thread = threading.Thread(target = run_getinfo) + message_threads.append(msg_thread) + msg_thread.setDaemon(True) + msg_thread.start() + + for i in xrange(100): + controller.connect() + controller.close() + + for msg_thread in message_threads: + msg_thread.join() + def test_status_notifications(self): """ Checks basic functionality of the add_status_listener() and

1 0

[torbrowser/maint-2.2] update recommend-versions for new 2.2.35-7.1
by erinn＠torproject.org 19 Feb '12

19 Feb '12

commit e8625ef8479a34aa20d6027f0783c37bcce1424f Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 19 14:27:15 2012 +0100 update recommend-versions for new 2.2.35-7.1 --- build-scripts/recommended-versions | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 3376e7f..52a5d5d 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,12 +1,7 @@ [ -"2.2.35-6-Linux-i686", -"2.2.35-6-Linux-x86_64", -"2.2.35-6-MacOS-i386", -"2.2.35-6-MacOS-x86_64", -"2.2.35-6-Windows", "2.2.35-7-Linux-i686", "2.2.35-7-Linux-x86_64", "2.2.35-7-MacOS-i386", -"2.2.35-7-MacOS-x86_64", -"2.2.35-7-Windows" +"2.2.35-7.1-MacOS-x86_64", +"2.2.35-7.1-Windows" ]

1 0

[torbrowser/maint-2.3] update recommend-versions for new 2.2.35-7.1
by erinn＠torproject.org 19 Feb '12

19 Feb '12

commit e8625ef8479a34aa20d6027f0783c37bcce1424f Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 19 14:27:15 2012 +0100 update recommend-versions for new 2.2.35-7.1 --- build-scripts/recommended-versions | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 3376e7f..52a5d5d 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,12 +1,7 @@ [ -"2.2.35-6-Linux-i686", -"2.2.35-6-Linux-x86_64", -"2.2.35-6-MacOS-i386", -"2.2.35-6-MacOS-x86_64", -"2.2.35-6-Windows", "2.2.35-7-Linux-i686", "2.2.35-7-Linux-x86_64", "2.2.35-7-MacOS-i386", -"2.2.35-7-MacOS-x86_64", -"2.2.35-7-Windows" +"2.2.35-7.1-MacOS-x86_64", +"2.2.35-7.1-Windows" ]

1 0

[torbrowser/master] update recommend-versions for new 2.2.35-7.1
by erinn＠torproject.org 19 Feb '12

19 Feb '12

commit e8625ef8479a34aa20d6027f0783c37bcce1424f Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 19 14:27:15 2012 +0100 update recommend-versions for new 2.2.35-7.1 --- build-scripts/recommended-versions | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 3376e7f..52a5d5d 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,12 +1,7 @@ [ -"2.2.35-6-Linux-i686", -"2.2.35-6-Linux-x86_64", -"2.2.35-6-MacOS-i386", -"2.2.35-6-MacOS-x86_64", -"2.2.35-6-Windows", "2.2.35-7-Linux-i686", "2.2.35-7-Linux-x86_64", "2.2.35-7-MacOS-i386", -"2.2.35-7-MacOS-x86_64", -"2.2.35-7-Windows" +"2.2.35-7.1-MacOS-x86_64", +"2.2.35-7.1-Windows" ]

1 0

r25456: {website} Revert the non-version changes of previous commit Looks like (website/trunk)
by Sebastian Hahn 19 Feb '12

19 Feb '12

Author: sebastian Date: 2012-02-19 12:54:52 +0000 (Sun, 19 Feb 2012) New Revision: 25456 Modified: website/trunk/Makefile website/trunk/publish Log: Revert the non-version changes of previous commit Looks like a ton of stuff got accidentally committed Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-02-19 12:44:32 UTC (rev 25455) +++ website/trunk/Makefile 2012-02-19 12:54:52 UTC (rev 25456) @@ -11,7 +11,7 @@ # 5. ./publish export STABLETAG=tor-0.2.2.35 -export DEVTAG=tor-0.2.3.11-alpha +export DEVTAG=tor-0.2.3.12-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-02-19 12:44:32 UTC (rev 25455) +++ website/trunk/publish 2012-02-19 12:54:52 UTC (rev 25456) @@ -1,17 +1,41 @@ #!/bin/sh set -e # stop if we encounter an error -make clean # clean cruft +# pull the latest changes +if [ -e .svn ] ; then + svn update +elif [ -e .git ] ; then + git svn rebase +else + echo 2>&1 "Cannot figure out which version control thing you're using. Skipping update" +fi -svn update # get changes +# clean up the working directory +make clean -make -j3 # abuse the cores +# actually build the site +make -j3 # don't copy over stuff with permissions that make it useless -#chmod a+r * -R chmod -R a+r * -rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs +rsync \ + --exclude .DS_Store \ + --exclude .svn \ + --exclude .git \ + --exclude '.*.sw[po]' \ + --exclude .deps \ + --exclude svn \ + --exclude dist \ + --exclude releases \ + --exclude torbutton-current.xpi \ + --exclude project \ + -Prvz --delete . www-master.torproject.org:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh vescum '/home/mirroradm/bin/trigger-mirrors' -ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs +ssh www-master.torproject.org ' + ( + find /srv/www-master.torproject.org/htdocs ! -perm -444 -print0 | xargs -0 --no-run-if-empty chmod -v a+r || + ( echo >&2 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run."; exit 1) + ) && + echo "Triggering mirror run" && + /home/mirroradm/bin/trigger-mirrors'

1 0

r25455: {website} update version numbers for corrected tbbs on windows and osx (in website/trunk: . include)
by Erinn Clark 19 Feb '12

19 Feb '12

Author: erinn Date: 2012-02-19 12:44:32 +0000 (Sun, 19 Feb 2012) New Revision: 25455 Modified: website/trunk/Makefile website/trunk/include/versions.wmi website/trunk/publish Log: update version numbers for corrected tbbs on windows and osx 64-bit Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-02-18 22:48:58 UTC (rev 25454) +++ website/trunk/Makefile 2012-02-19 12:44:32 UTC (rev 25455) @@ -11,7 +11,7 @@ # 5. ./publish export STABLETAG=tor-0.2.2.35 -export DEVTAG=tor-0.2.3.12-alpha +export DEVTAG=tor-0.2.3.11-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-02-18 22:48:58 UTC (rev 25454) +++ website/trunk/include/versions.wmi 2012-02-19 12:44:32 UTC (rev 25455) @@ -27,7 +27,7 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.12-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.35-7</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.35-7.1</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.17-stable, zlib-1.2.6, openssl-1.0.0g</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>10.0.2</define-tag> @@ -46,7 +46,7 @@ <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-7</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-7</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-7.1</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.2</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-02-18 22:48:58 UTC (rev 25454) +++ website/trunk/publish 2012-02-19 12:44:32 UTC (rev 25455) @@ -1,41 +1,17 @@ #!/bin/sh set -e # stop if we encounter an error -# pull the latest changes -if [ -e .svn ] ; then - svn update -elif [ -e .git ] ; then - git svn rebase -else - echo 2>&1 "Cannot figure out which version control thing you're using. Skipping update" -fi +make clean # clean cruft -# clean up the working directory -make clean +svn update # get changes -# actually build the site -make -j3 +make -j3 # abuse the cores # don't copy over stuff with permissions that make it useless +#chmod a+r * -R chmod -R a+r * -rsync \ - --exclude .DS_Store \ - --exclude .svn \ - --exclude .git \ - --exclude '.*.sw[po]' \ - --exclude .deps \ - --exclude svn \ - --exclude dist \ - --exclude releases \ - --exclude torbutton-current.xpi \ - --exclude project \ - -Prvz --delete . www-master.torproject.org:/srv/www-master.torproject.org/htdocs +rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh www-master.torproject.org ' - ( - find /srv/www-master.torproject.org/htdocs ! -perm -444 -print0 | xargs -0 --no-run-if-empty chmod -v a+r || - ( echo >&2 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run."; exit 1) - ) && - echo "Triggering mirror run" && - /home/mirroradm/bin/trigger-mirrors' +ssh vescum '/home/mirroradm/bin/trigger-mirrors' +ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs

1 0

[torbrowser/maint-2.3] update windows and osx 64-bit bundles to include missing firefox 10.0.2
by erinn＠torproject.org 19 Feb '12

19 Feb '12

commit 952ea2f80a08737ccdd238761ab98be1d7504e41 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 19 13:40:28 2012 +0100 update windows and osx 64-bit bundles to include missing firefox 10.0.2 --- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.osx-2.2 | 6 ++++++ changelog.windows-2.2 | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index c7bf9b3..3cacc0a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=7 +BUILD_NUM=7.1 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 7e7ebc0..8feb6f9 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=7 +BUILD_NUM=7.1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 9148e79..8a0fd24 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-7.1); suite=osx + + * Actually update Firefox to 10.0.2 in the 64-bit bundle + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 19 01:35:09 CET 2012 + Tor Browser Bundle (2.2.35-7); suite=osx * Update Firefox to 10.0.2 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 2285e1a..9566857 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-7.1); suite=windows + + * Actually update to Firefox 10.0.2 + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 19 01:36:29 CET 2012 + Tor Browser Bundle (2.2.35-7); suite=windows * Update Firefox to 10.0.2

1 0

[torbrowser/maint-2.2] update windows and osx 64-bit bundles to include missing firefox 10.0.2
by erinn＠torproject.org 19 Feb '12

19 Feb '12

commit 952ea2f80a08737ccdd238761ab98be1d7504e41 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 19 13:40:28 2012 +0100 update windows and osx 64-bit bundles to include missing firefox 10.0.2 --- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.osx-2.2 | 6 ++++++ changelog.windows-2.2 | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index c7bf9b3..3cacc0a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=7 +BUILD_NUM=7.1 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 7e7ebc0..8feb6f9 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=7 +BUILD_NUM=7.1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 9148e79..8a0fd24 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-7.1); suite=osx + + * Actually update Firefox to 10.0.2 in the 64-bit bundle + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 19 01:35:09 CET 2012 + Tor Browser Bundle (2.2.35-7); suite=osx * Update Firefox to 10.0.2 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 2285e1a..9566857 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-7.1); suite=windows + + * Actually update to Firefox 10.0.2 + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 19 01:36:29 CET 2012 + Tor Browser Bundle (2.2.35-7); suite=windows * Update Firefox to 10.0.2

1 0