- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] update contents and location of qt.conf so that it works as intended in osx tbb
by erinn＠torproject.org 12 Feb '12

12 Feb '12

commit 394ba79fd9d7b2a54744a45d88960c550b92b9aa Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 12 17:09:44 2012 +0100 update contents and location of qt.conf so that it works as intended in osx tbb --- build-scripts/config/qt.conf | 2 +- build-scripts/osx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/qt.conf b/build-scripts/config/qt.conf index ecb499a..64d7297 100644 --- a/build-scripts/config/qt.conf +++ b/build-scripts/config/qt.conf @@ -1,2 +1,2 @@ [Paths] -Plugins = +Plugins = PlugIns diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6fbcc03..6607367 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -291,7 +291,7 @@ configure-apps: cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js cp $(CONFIG_SRC)/Info.plist $(DEST)/Contents cp $(CONFIG_SRC)/PkgInfo $(DEST)/Contents - cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/Resources + cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources cp $(CONFIG_SRC)/vidalia.icns $(DEST)/Contents/Resources ## Configure Vidalia

1 0

[torbrowser/maint-2.2] bump all tbbs to 2.2.35-6 for new vidalia, libevent, and firefox
by erinn＠torproject.org 12 Feb '12

12 Feb '12

commit a79fd43eaa2ea2dfbb627f356ec06aa2984a6c40 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 12 17:09:19 2012 +0100 bump all tbbs to 2.2.35-6 for new vidalia, libevent, and firefox --- README.LINUX-2.2 | 8 ++++---- README.OSX-2.2 | 8 ++++---- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 46 insertions(+), 19 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 8f0323f..8c3bea9 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) -Firefox 10.0 +Vidalia 0.2.17 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g) +Firefox 10.0.1 \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.8 + |_ NoScript 2.3 |_ HTTPS-Everywhere 1.2.2 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index c208895..de2d87a 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) -Firefox 10.0 +Vidalia 0.2.17 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g) +Firefox 10.0.1 \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.8 + |_ NoScript 2.3 |_ HTTPS-Everywhere 1.2.2 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 9d466c1..9c406ec 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) -Firefox 10.0 +Vidalia 0.2.17 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g) +Firefox 10.0.1 \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.8 + |_ NoScript 2.3 |_ HTTPS-Everywhere 1.2.2 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 2981381..24a4d90 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 4a13151..6fbcc03 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=5 +BUILD_NUM=6 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index c8e3d98..239727f 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,17 +3,17 @@ RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.2 -FIREFOX_VER=10.0 -LIBEVENT_VER=2.0.16-stable +FIREFOX_VER=10.0.1 +LIBEVENT_VER=2.0.17-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.2.8 +NOSCRIPT_VER=2.3 OPENSSL_VER=1.0.0g OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.7.4 TOR_VER=0.2.2.35 TORBUTTON_VER=1.4.5.1 -VIDALIA_VER=0.2.15 +VIDALIA_VER=0.2.17 ZLIB_VER=1.2.6 ## Extension IDs diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 143d82c..2e390a9 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 9a5fa6a..287e20d 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-6); suite=linux + + * Update Firefox to 10.0.1 + * Update Vidalia to 0.2.17 + * Update Libevent to 2.0.17-stable + * Update NoScript to 2.3 + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:16:42 CET 2012 + Tor Browser Bundle (2.2.35-5); suite=linux * Update Firefox to 10.0 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index d93db4a..5f7a6a2 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-6); suite=osx + + * Update Firefox to 10.0.1 + * Update Vidalia to 0.2.17 + * Update Libevent to 2.0.17-stable + * Update NoScript to 2.3 + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:15:30 CET 2012 + Tor Browser Bundle (2.2.35-5); suite=osx * Update Firefox to 10.0 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index f53a1af..5c3e519 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-6); suite=windows + + * Update Firefox to 10.0.1 + * Update Vidalia to 0.2.17 + * Update Libevent to 2.0.17-stable + * Update NoScript to 2.3 + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:16:38 CET 2012 + Tor Browser Bundle (2.2.35-5); suite=windows * Update Firefox to 10.0

1 0

[torbrowser/maint-2.3] update contents and location of qt.conf so that it works as intended in osx tbb
by erinn＠torproject.org 12 Feb '12

12 Feb '12

commit 394ba79fd9d7b2a54744a45d88960c550b92b9aa Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 12 17:09:44 2012 +0100 update contents and location of qt.conf so that it works as intended in osx tbb --- build-scripts/config/qt.conf | 2 +- build-scripts/osx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/qt.conf b/build-scripts/config/qt.conf index ecb499a..64d7297 100644 --- a/build-scripts/config/qt.conf +++ b/build-scripts/config/qt.conf @@ -1,2 +1,2 @@ [Paths] -Plugins = +Plugins = PlugIns diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6fbcc03..6607367 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -291,7 +291,7 @@ configure-apps: cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js cp $(CONFIG_SRC)/Info.plist $(DEST)/Contents cp $(CONFIG_SRC)/PkgInfo $(DEST)/Contents - cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/Resources + cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources cp $(CONFIG_SRC)/vidalia.icns $(DEST)/Contents/Resources ## Configure Vidalia

1 0

[torbrowser/maint-2.3] bump all tbbs to 2.2.35-6 for new vidalia, libevent, and firefox
by erinn＠torproject.org 12 Feb '12

12 Feb '12

commit a79fd43eaa2ea2dfbb627f356ec06aa2984a6c40 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 12 17:09:19 2012 +0100 bump all tbbs to 2.2.35-6 for new vidalia, libevent, and firefox --- README.LINUX-2.2 | 8 ++++---- README.OSX-2.2 | 8 ++++---- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 46 insertions(+), 19 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 8f0323f..8c3bea9 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) -Firefox 10.0 +Vidalia 0.2.17 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g) +Firefox 10.0.1 \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.8 + |_ NoScript 2.3 |_ HTTPS-Everywhere 1.2.2 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index c208895..de2d87a 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) -Firefox 10.0 +Vidalia 0.2.17 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g) +Firefox 10.0.1 \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.8 + |_ NoScript 2.3 |_ HTTPS-Everywhere 1.2.2 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 9d466c1..9c406ec 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) -Firefox 10.0 +Vidalia 0.2.17 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g) +Firefox 10.0.1 \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.8 + |_ NoScript 2.3 |_ HTTPS-Everywhere 1.2.2 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 2981381..24a4d90 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 4a13151..6fbcc03 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=5 +BUILD_NUM=6 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index c8e3d98..239727f 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,17 +3,17 @@ RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.2 -FIREFOX_VER=10.0 -LIBEVENT_VER=2.0.16-stable +FIREFOX_VER=10.0.1 +LIBEVENT_VER=2.0.17-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.2.8 +NOSCRIPT_VER=2.3 OPENSSL_VER=1.0.0g OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.7.4 TOR_VER=0.2.2.35 TORBUTTON_VER=1.4.5.1 -VIDALIA_VER=0.2.15 +VIDALIA_VER=0.2.17 ZLIB_VER=1.2.6 ## Extension IDs diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 143d82c..2e390a9 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 9a5fa6a..287e20d 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-6); suite=linux + + * Update Firefox to 10.0.1 + * Update Vidalia to 0.2.17 + * Update Libevent to 2.0.17-stable + * Update NoScript to 2.3 + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:16:42 CET 2012 + Tor Browser Bundle (2.2.35-5); suite=linux * Update Firefox to 10.0 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index d93db4a..5f7a6a2 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-6); suite=osx + + * Update Firefox to 10.0.1 + * Update Vidalia to 0.2.17 + * Update Libevent to 2.0.17-stable + * Update NoScript to 2.3 + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:15:30 CET 2012 + Tor Browser Bundle (2.2.35-5); suite=osx * Update Firefox to 10.0 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index f53a1af..5c3e519 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-6); suite=windows + + * Update Firefox to 10.0.1 + * Update Vidalia to 0.2.17 + * Update Libevent to 2.0.17-stable + * Update NoScript to 2.3 + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:16:38 CET 2012 + Tor Browser Bundle (2.2.35-5); suite=windows * Update Firefox to 10.0

1 0

[torbrowser/master] bump all tbbs to 2.2.35-6 for new vidalia, libevent, and firefox
by erinn＠torproject.org 12 Feb '12

12 Feb '12

commit a79fd43eaa2ea2dfbb627f356ec06aa2984a6c40 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 12 17:09:19 2012 +0100 bump all tbbs to 2.2.35-6 for new vidalia, libevent, and firefox --- README.LINUX-2.2 | 8 ++++---- README.OSX-2.2 | 8 ++++---- README.WIN-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 46 insertions(+), 19 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 8f0323f..8c3bea9 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) -Firefox 10.0 +Vidalia 0.2.17 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g) +Firefox 10.0.1 \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.8 + |_ NoScript 2.3 |_ HTTPS-Everywhere 1.2.2 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index c208895..de2d87a 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) -Firefox 10.0 +Vidalia 0.2.17 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g) +Firefox 10.0.1 \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.8 + |_ NoScript 2.3 |_ HTTPS-Everywhere 1.2.2 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 9d466c1..9c406ec 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) -Firefox 10.0 +Vidalia 0.2.17 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g) +Firefox 10.0.1 \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.8 + |_ NoScript 2.3 |_ HTTPS-Everywhere 1.2.2 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 2981381..24a4d90 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 4a13151..6fbcc03 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=5 +BUILD_NUM=6 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index c8e3d98..239727f 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,17 +3,17 @@ RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.2 -FIREFOX_VER=10.0 -LIBEVENT_VER=2.0.16-stable +FIREFOX_VER=10.0.1 +LIBEVENT_VER=2.0.17-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.2.8 +NOSCRIPT_VER=2.3 OPENSSL_VER=1.0.0g OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.7.4 TOR_VER=0.2.2.35 TORBUTTON_VER=1.4.5.1 -VIDALIA_VER=0.2.15 +VIDALIA_VER=0.2.17 ZLIB_VER=1.2.6 ## Extension IDs diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 143d82c..2e390a9 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 9a5fa6a..287e20d 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-6); suite=linux + + * Update Firefox to 10.0.1 + * Update Vidalia to 0.2.17 + * Update Libevent to 2.0.17-stable + * Update NoScript to 2.3 + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:16:42 CET 2012 + Tor Browser Bundle (2.2.35-5); suite=linux * Update Firefox to 10.0 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index d93db4a..5f7a6a2 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-6); suite=osx + + * Update Firefox to 10.0.1 + * Update Vidalia to 0.2.17 + * Update Libevent to 2.0.17-stable + * Update NoScript to 2.3 + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:15:30 CET 2012 + Tor Browser Bundle (2.2.35-5); suite=osx * Update Firefox to 10.0 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index f53a1af..5c3e519 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-6); suite=windows + + * Update Firefox to 10.0.1 + * Update Vidalia to 0.2.17 + * Update Libevent to 2.0.17-stable + * Update NoScript to 2.3 + + -- Erinn Clark <erinn(a)torproject.org> Sun Feb 12 14:16:38 CET 2012 + Tor Browser Bundle (2.2.35-5); suite=windows * Update Firefox to 10.0

1 0

[torbrowser/master] update contents and location of qt.conf so that it works as intended in osx tbb
by erinn＠torproject.org 12 Feb '12

12 Feb '12

commit 394ba79fd9d7b2a54744a45d88960c550b92b9aa Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 12 17:09:44 2012 +0100 update contents and location of qt.conf so that it works as intended in osx tbb --- build-scripts/config/qt.conf | 2 +- build-scripts/osx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/qt.conf b/build-scripts/config/qt.conf index ecb499a..64d7297 100644 --- a/build-scripts/config/qt.conf +++ b/build-scripts/config/qt.conf @@ -1,2 +1,2 @@ [Paths] -Plugins = +Plugins = PlugIns diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6fbcc03..6607367 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -291,7 +291,7 @@ configure-apps: cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js cp $(CONFIG_SRC)/Info.plist $(DEST)/Contents cp $(CONFIG_SRC)/PkgInfo $(DEST)/Contents - cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/Resources + cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources cp $(CONFIG_SRC)/vidalia.icns $(DEST)/Contents/Resources ## Configure Vidalia

1 0

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

12 Feb '12

commit 87ddffe512bcdbfe14931f03163e4df98553309a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 12 16:45:26 2012 +0000 Update translations for vidalia_help --- pt_BR/netview.po | 58 ++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 43 insertions(+), 15 deletions(-) diff --git a/pt_BR/netview.po b/pt_BR/netview.po index 00619d7..27b232a 100644 --- a/pt_BR/netview.po +++ b/pt_BR/netview.po @@ -6,7 +6,7 @@ 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 17:00+0200\n" -"PO-Revision-Date: 2012-02-12 15:55+0000\n" +"PO-Revision-Date: 2012-02-12 16:45+0000\n" "Last-Translator: n3t0 <>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -114,6 +114,15 @@ msgid "" " not revealed to the GeoIP relay. The results of the lookups will be cached " "locally in order to reduce load on Vidalia's GeoIP relays." msgstr "" +"No meio da caixa de diálogo, abaixo do mapa da rede, você verá uma lista dos" +" seus circuitos atuais, bem como qualquer tráfego de aplicação atualmente " +"nestes circuitos. Quando o mapa da rede carrega a primeira vez, você verá " +"provavelmente uma conexão com geoip.vidalia-project.net, que ocorre quando o" +" Vidalia está procurando por informações geográficas da lista de " +"retransmissores Tor. É importante notar que esta requisição é feita através " +"do Tor, portanto sua localização não é revelada ao retransmissor GeoIP. Os " +"resultados da procura serão cacheados localmente a fim de reduzir o " +"carregamento no retransmissor GeoIP do Vidalia." #. type: Content of: <html><body> #: en/netview.html:66 @@ -132,11 +141,15 @@ msgid "" "Tor network. Next to each relay is an icon indicating that relay's status. " "The following table summarizes the possible relay status icons:" msgstr "" +"No lado esquerdo da visão da rede, você verá uma lista de retransmissores " +"dentro da rede Tor. Depois, cada retransmissor é um ícone indicando seu " +"status. A tabela abaixo resume os possíveis ícones de status de " +"retransmissor:" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:78 msgid "The relay is offline or simply not responding." -msgstr "" +msgstr "O retransmissor está offline ou simplesmente não responde." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:84 @@ -144,26 +157,29 @@ msgid "" "The relay is <i>hibernating</i>, meaning it is online, but has used up as " "much bandwidth as the operator is willing to allow for a given time period." msgstr "" +"O retransmissor está <i>hibernando</i>, significa que está online, mas tem " +"usado muita largura de banda como o operador está disposto a habilitar por " +"um certo período de tempo." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:92 msgid "The relay is online, but has shown only minimal throughput." -msgstr "" +msgstr "O retransmissor está online, mas mostrou apenas vazão mínima." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:98 msgid "The relay is online and has shown a throughput >= 20 KB/s." -msgstr "" +msgstr "O retransmissor está online e mostrou uma vazão >= 20KB/s." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:104 msgid "The relay is online and has shown a throughput >= 60 KB/s." -msgstr "" +msgstr "O retransmissor está online e mostrou uma vazão >= 60KB/s." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:110 msgid "The relay is online and has shown a throughput >= 400 KB/s." -msgstr "" +msgstr "O retransmissor está online e mostrou uma vazão >= 400KB/s." #. type: Content of: <html><body><p> #: en/netview.html:116 @@ -172,6 +188,9 @@ msgid "" "maximum bandwidth sustained input or output over any ten second period in " "the past day." msgstr "" +"Todos os valores de largura de banda são estimados no mínimo entre a máxima " +"largura de banda suportada de saída ou entrada pelo período de quaisquer 10 " +"segundos do dia anterior." #. type: Content of: <html><body> #: en/netview.html:122 @@ -181,7 +200,7 @@ msgstr "<a name=\"details\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:123 msgid "Relay Details" -msgstr "" +msgstr "Detalhes do Retransmissor" #. type: Content of: <html><body><p> #: en/netview.html:125 @@ -199,31 +218,33 @@ msgid "" "The fields that you may see in the panel are as follows (<i>Note</i>: not " "all of these fields will always be present):" msgstr "" +"Os campos que você pode ver no painel são como os seguintes (<i>Nota</i>: " +"nem todos os campos estarão sempre presentes)" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:138 msgid "<b>Location</b>" -msgstr "" +msgstr "<b>Localização</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:139 msgid "The geographic location of this Tor relay." -msgstr "" +msgstr "A localização geográfica deste retransmissor Tor." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:142 msgid "<b>IP Address</b>" -msgstr "" +msgstr "<b>Endereço IP</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:143 msgid "IP address at which this Tor relay can be reached." -msgstr "" +msgstr "Endereço IP pelo qual o retransmissor Tor pode ser acessado." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:146 msgid "<b>Platform</b>" -msgstr "" +msgstr "<b>Plataforma</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:148 @@ -231,11 +252,13 @@ msgid "" "Operating system information and Tor version on which this relay is " "currently running." msgstr "" +"Informação do sistema operacional e versão atual do Tor que o retransmissor " +"está atualmente rodando." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:153 msgid "<b>Bandwidth</b>" -msgstr "" +msgstr "<b>Largura de Banda</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:155 @@ -243,11 +266,13 @@ msgid "" "Estimated maximum amount of bandwidth that the directory relays have seen " "this relay handle recently." msgstr "" +"Estimativa máxima de montante de largura de banda que o diretório de " +"retransmissores tem visto este retransmissor manipulado recentemente. " #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:160 msgid "<b>Uptime</b>" -msgstr "" +msgstr "<b>Tempo de Funcionamento</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:162 @@ -255,15 +280,18 @@ msgid "" "Length of time this relay has been available, which can be used to help " "estimate this relay's stability." msgstr "" +"Quantidade de tempo que este retransmissor está funcionando, a qual pode ser" +" usada para estimar a estabilidade do retransmissor." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:167 msgid "<b>Last Updated</b>" -msgstr "" +msgstr "<b>Última Atualização</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:168 msgid "Date this relay's information was last updated." msgstr "" +"Data em que a informação deste retransmissor foi atualizada pela última vez."

1 0

[ooni-probe/master] Added support for calculating live bandwidth
by art＠torproject.org 12 Feb '12

12 Feb '12

commit 95dff813017a4721c94340d3a23fed2893942c20 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Feb 12 00:36:30 2012 +0530 Added support for calculating live bandwidth --- refactor/TorCtl | 1 + refactor/tests/bridget.py | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/refactor/TorCtl b/refactor/TorCtl new file mode 160000 index 0000000..3de9176 --- /dev/null +++ b/refactor/TorCtl @@ -0,0 +1 @@ +Subproject commit 3de91767e208d1642a8cf89dc1b645f637abaf8e diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 5ad16c0..202181b 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -44,7 +44,8 @@ class BridgeT(Plugoo): def writetorrc(self, bridge): # register Tor to an ephemeral port - socksport = random.randint(49152, 65535) + #socksport = random.randint(49152, 65535) + socksport = 9050 controlport = random.randint(49152, 65535) randomname = "tor_"+str(random.randint(0, 424242424242)) datadir = "/tmp/" + randomname @@ -64,7 +65,7 @@ bridge %s DataDirectory %s usemicrodescriptors 0 """ % (socksport, bridge, datadir) - + print torrc try: f = open(randomname, "wb") f.write(torrc) @@ -86,16 +87,18 @@ usemicrodescriptors 0 @torify def download_file(self): + time_start=time.time() f = urllib2.urlopen('http://check.torproject.org') - print f.readlines() - + data= f.readlines() + time_end = time.time() + return len(data)/(time_end-time_start) def connect(self, bridge, timeout=None): if not timeout: if self.config.tests.tor_bridges_timeout: self.timeout = self.config.tests.tor_bridges_timeout timeout = self.timeout - self.download_file() + #self.download_file() torrc, tordir, controlport = self.writetorrc(bridge) cmd = ["tor", "-f", torrc] @@ -114,6 +117,8 @@ usemicrodescriptors 0 c = TorCtl.connect('127.0.0.1', controlport) bridgeinfo = self.parsebridgeinfo(c.get_info('dir/server/all')['dir/server/all']) c.close() + bandwidth=self.download_file() + print bandwidth p.stdout.close() os.unlink(os.path.join(os.getcwd(), torrc)) rmtree(tordir) @@ -122,13 +127,14 @@ usemicrodescriptors 0 'Time': datetime.now(), 'Bridge': bridge, 'Working': True, - 'Descriptor': bridgeinfo + 'Descriptor': bridgeinfo, + 'Calculated bandwidth': bandwidth } if re.search("%", o): # Keep updating the timeout if there is progress tupdate = time.time() - print ".", + print o continue except IOError:

1 0

[ooni-probe/master] Add clean() to remove torrc after completion
by art＠torproject.org 12 Feb '12

12 Feb '12

commit a951bf44666e75fc4abc6ecfba6ef23861c34b40 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Feb 12 14:37:38 2012 +0530 Add clean() to remove torrc after completion --- refactor/tests/bridget.py | 39 +++++++++++++++++++++++++-------------- 1 files changed, 25 insertions(+), 14 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 202181b..10ba144 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -44,8 +44,7 @@ class BridgeT(Plugoo): def writetorrc(self, bridge): # register Tor to an ephemeral port - #socksport = random.randint(49152, 65535) - socksport = 9050 + socksport = random.randint(49152, 65535) controlport = random.randint(49152, 65535) randomname = "tor_"+str(random.randint(0, 424242424242)) datadir = "/tmp/" + randomname @@ -66,14 +65,12 @@ DataDirectory %s usemicrodescriptors 0 """ % (socksport, bridge, datadir) print torrc - try: - f = open(randomname, "wb") + + with open(randomname, "wb") as f: f.write(torrc) - finally: - f.close() - + os.mkdir(datadir) - return (randomname, datadir, controlport) + return (randomname, datadir, controlport, socksport) def parsebridgeinfo(self, output): ret = {} @@ -85,12 +82,17 @@ usemicrodescriptors 0 ret[cfield[0]] = ' '.join(cfield[1:]) return ret - @torify - def download_file(self): + #Can't use @torify as it doesn't support concurrency right now + def download_file(self, socksport): + socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", int(socksport)) + socks.wrapmodule(urllib2) time_start=time.time() f = urllib2.urlopen('http://check.torproject.org') data= f.readlines() + print data + print len(data) time_end = time.time() + print (time_end-time_start) return len(data)/(time_end-time_start) def connect(self, bridge, timeout=None): @@ -99,7 +101,7 @@ usemicrodescriptors 0 self.timeout = self.config.tests.tor_bridges_timeout timeout = self.timeout #self.download_file() - torrc, tordir, controlport = self.writetorrc(bridge) + torrc, tordir, controlport, socksport = self.writetorrc(bridge) cmd = ["tor", "-f", torrc] tupdate = time.time() @@ -112,13 +114,22 @@ usemicrodescriptors 0 o = "" try: o = p.stdout.read(4096) + if o: + print o if re.search("100%", o): print "%s bridge works" % bridge + print "%s controlport" % controlport c = TorCtl.connect('127.0.0.1', controlport) + print c + #c.set_event_handler(LogHandler()) + #c.set_events(["DEBUG", "INFO", "NOTICE", "WARN", "ERR"]) bridgeinfo = self.parsebridgeinfo(c.get_info('dir/server/all')['dir/server/all']) - c.close() - bandwidth=self.download_file() + #circID = c.extend_circuit(0, ["bridge","serenity"]) + bandwidth=self.download_file(socksport) print bandwidth + print c.get_info('stream-status') + #c.signal("HALT") + c.close() p.stdout.close() os.unlink(os.path.join(os.getcwd(), torrc)) rmtree(tordir) @@ -134,7 +145,7 @@ usemicrodescriptors 0 if re.search("%", o): # Keep updating the timeout if there is progress tupdate = time.time() - print o + #print o continue except IOError:

1 0

[ooni-probe/master] Fix bug in utils.py
by art＠torproject.org 12 Feb '12

12 Feb '12

commit e765c73bf1c96258a18f3609b5ee3a7ed369c58d Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Feb 12 14:10:25 2012 +0530 Fix bug in utils.py UnboundLocalError: local variable 'f' referenced before assignment. Fixed by using 'with' rather than manually opening and closing file descriptors. --- refactor/utils.py | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/refactor/utils.py b/refactor/utils.py index cc5ae48..5c743ba 100644 --- a/refactor/utils.py +++ b/refactor/utils.py @@ -68,29 +68,28 @@ def get_logger(config): def parse_asset(asset): parsed = Storage() try: - f = open(asset, 'r') - for line in f.readlines(): + with open(asset, 'r') as f: + for line in f.readlines(): # XXX This should be rewritten, if the values contain # #: they will be rewritten with blank. # should not be an issue but this is not a very good parser - if line.startswith("#:"): - n = line.split(' ')[0].replace('#:','') - v = line.replace('#:'+n+' ', '').strip() - if n in ('tests', 'files'): - parsed[n] = v.split(",") + if line.startswith("#:"): + n = line.split(' ')[0].replace('#:','') + v = line.replace('#:'+n+' ', '').strip() + if n in ('tests', 'files'): + parsed[n] = v.split(",") + else: + parsed[n] = v + + elif line.startswith("#"): + continue else: - parsed[n] = v - - elif line.startswith("#"): - continue - else: - break + break finally: if not parsed.name: parsed.name = asset if not parsed.files: parsed.files = asset - f.close() return parsed def import_test(name, config):

1 0