February 2012 - tor-commits - lists.torproject.org

[torbrowser/maint-2.2] bump libpng version to 1.5.9
by sebastian＠torproject.org 20 Feb '12

20 Feb '12

commit 8838be5ef1783212578f4c9561af2b27c987639e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 19 22:30:59 2012 +0100 bump libpng version to 1.5.9 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 8277253..5b21a88 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -5,7 +5,7 @@ RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.2 FIREFOX_VER=10.0.2 LIBEVENT_VER=2.0.17-stable -LIBPNG_VER=1.4.8 +LIBPNG_VER=1.5.9 NOSCRIPT_VER=2.3 OPENSSL_VER=1.0.0g OTR_VER=3.2.0

1 0

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

20 Feb '12

commit 6b0b96f4272f8e8da6c7d4085def53ba32bf9883 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 20 08:45:39 2012 +0000 Update translations for torcheck_completed --- eu/torcheck.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eu/torcheck.po b/eu/torcheck.po index 93812d7..50b7274 100644 --- a/eu/torcheck.po +++ b/eu/torcheck.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2012-02-14 20:28+PDT\n" -"PO-Revision-Date: 2012-02-17 21:25+0000\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2012-02-20 08:33+0000\n" "Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ msgid "" "the Internet anonymously." msgstr "Mesedez <a href=\"https://www.torproject.org/\">Tor webgunera</a> joan Tor era seguruan erabiltzeko informazio gehiago nahi izanez gero. Aske zara orain Interneten zehar anonimoki nabigatzeko." -msgid "There is an update available for the Tor Browser Bundle." -msgstr "Tor Nabigatzaile Bilgarriarentzako eguneraketa bat dago eskuragarri." +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "Segurtasun eguneraketa bat eskuragarri dago Tor Browser Bundlearentzako." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click "

1 0

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

20 Feb '12

commit 7f90d52031fc63984f8312565a0c3b9914646cdf Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 20 08:45:37 2012 +0000 Update translations for torcheck --- eu/torcheck.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eu/torcheck.po b/eu/torcheck.po index 12a910f..50b7274 100644 --- a/eu/torcheck.po +++ b/eu/torcheck.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-02-18 09:03+0000\n" +"PO-Revision-Date: 2012-02-20 08:33+0000\n" "Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgid "" msgstr "Mesedez <a href=\"https://www.torproject.org/\">Tor webgunera</a> joan Tor era seguruan erabiltzeko informazio gehiago nahi izanez gero. Aske zara orain Interneten zehar anonimoki nabigatzeko." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "Segurtasun eguneraketa bat eskuragarri dago Tor Browser Bundlearentzako." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click "

1 0

[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