- tor-commits - lists.torproject.org

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Aug '12

27 Aug '12

commit f764ddd2ceb8dc99a10afb27eeec65dd7a2bab91 Merge: 18d1057 b88ec22 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 27 07:29:04 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.3'
by erinn＠torproject.org 27 Aug '12

27 Aug '12

commit 3356ab5dca3fc20981ad114e642a1bb61e535b92 Merge: 31c0e3c f764ddd Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 27 07:29:09 2012 +0100 Merge branch 'maint-2.3' build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/maint-2.2] bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere
by erinn＠torproject.org 27 Aug '12

27 Aug '12

commit 2c75280860ead77ce2969d8179ec34087382d545 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 27 07:13:27 2012 +0100 bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere --- 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 | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 45 insertions(+), 18 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index c051a3c..2ee157d 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.6esr +Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5 - |_ HTTPS-Everywhere 2.1 + |_ NoScript 2.5.2 + |_ HTTPS-Everywhere 2.2.1 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 1675e39..dc6d794 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.6esr +Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5 - |_ HTTPS-Everywhere 2.1 + |_ NoScript 2.5.2 + |_ HTTPS-Everywhere 2.2.1 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 6cb3ef9..6e8ae48 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.6esr +Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5 - |_ HTTPS-Everywhere 2.1 + |_ NoScript 2.5.2 + |_ HTTPS-Everywhere 2.2.1 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 170916b..b2e5f7b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ceb3e7..f08b50c 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e41d0f5..a082236 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -7,15 +7,15 @@ OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 -LIBEVENT_VER=2.0.19-stable +LIBEVENT_VER=2.0.20-stable TOR_VER=0.2.2.38 PIDGIN_VER=2.6.4 FIREFOX_VER=10.0.7esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.5 -HTTPSEVERYWHERE_VER=2.1 +NOSCRIPT_VER=2.5.2 +HTTPSEVERYWHERE_VER=2.2.1 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 0492f84..a871270 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 31149a2..c4b6d52 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.38-2); suite=linux + + * Update Firefox to 10.0.7esr + * Update Libevent to 2.0.20-stable + * Update NoScript to 2.5.2 + * Update HTTPS Everywhere to 2.2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:22 BST 2012 + Tor Browser Bundle (2.2.38-1); suite=linux * Update Tor to 0.2.2.38 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index f1c7681..d3b0776 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.38-2); suite=osx + + * Update Firefox to 10.0.7esr + * Update Libevent to 2.0.20-stable + * Update NoScript to 2.5.2 + * Update HTTPS Everywhere to 2.2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:24 BST 2012 + Tor Browser Bundle (2.2.38-1); suite=osx * Update Tor to 0.2.2.38 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 2d0fb2c..a604b2c 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.38-2); suite=windows + + * Update Firefox to 10.0.7esr + * Update Libevent to 2.0.20-stable + * Update NoScript to 2.5.2 + * Update HTTPS Everywhere to 2.2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:19 BST 2012 + Tor Browser Bundle (2.2.38-1); suite=windows * Update Tor to 0.2.2.38

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Aug '12

27 Aug '12

commit 18d1057df5a2e539d9d48552da3cad4962b5959e Merge: 0aafb37 2c75280 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 27 07:13:55 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 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 | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 45 insertions(+), 18 deletions(-)

1 0

[torbrowser/maint-2.3] bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere
by erinn＠torproject.org 27 Aug '12

27 Aug '12

commit 2c75280860ead77ce2969d8179ec34087382d545 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 27 07:13:27 2012 +0100 bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere --- 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 | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 45 insertions(+), 18 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index c051a3c..2ee157d 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.6esr +Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5 - |_ HTTPS-Everywhere 2.1 + |_ NoScript 2.5.2 + |_ HTTPS-Everywhere 2.2.1 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 1675e39..dc6d794 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.6esr +Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5 - |_ HTTPS-Everywhere 2.1 + |_ NoScript 2.5.2 + |_ HTTPS-Everywhere 2.2.1 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 6cb3ef9..6e8ae48 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.6esr +Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5 - |_ HTTPS-Everywhere 2.1 + |_ NoScript 2.5.2 + |_ HTTPS-Everywhere 2.2.1 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 170916b..b2e5f7b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ceb3e7..f08b50c 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e41d0f5..a082236 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -7,15 +7,15 @@ OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 -LIBEVENT_VER=2.0.19-stable +LIBEVENT_VER=2.0.20-stable TOR_VER=0.2.2.38 PIDGIN_VER=2.6.4 FIREFOX_VER=10.0.7esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.5 -HTTPSEVERYWHERE_VER=2.1 +NOSCRIPT_VER=2.5.2 +HTTPSEVERYWHERE_VER=2.2.1 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 0492f84..a871270 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 31149a2..c4b6d52 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.38-2); suite=linux + + * Update Firefox to 10.0.7esr + * Update Libevent to 2.0.20-stable + * Update NoScript to 2.5.2 + * Update HTTPS Everywhere to 2.2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:22 BST 2012 + Tor Browser Bundle (2.2.38-1); suite=linux * Update Tor to 0.2.2.38 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index f1c7681..d3b0776 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.38-2); suite=osx + + * Update Firefox to 10.0.7esr + * Update Libevent to 2.0.20-stable + * Update NoScript to 2.5.2 + * Update HTTPS Everywhere to 2.2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:24 BST 2012 + Tor Browser Bundle (2.2.38-1); suite=osx * Update Tor to 0.2.2.38 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 2d0fb2c..a604b2c 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.38-2); suite=windows + + * Update Firefox to 10.0.7esr + * Update Libevent to 2.0.20-stable + * Update NoScript to 2.5.2 + * Update HTTPS Everywhere to 2.2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:19 BST 2012 + Tor Browser Bundle (2.2.38-1); suite=windows * Update Tor to 0.2.2.38

1 0

[torbrowser/master] bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere
by erinn＠torproject.org 27 Aug '12

27 Aug '12

commit 2c75280860ead77ce2969d8179ec34087382d545 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 27 07:13:27 2012 +0100 bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere --- 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 | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 45 insertions(+), 18 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index c051a3c..2ee157d 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.6esr +Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5 - |_ HTTPS-Everywhere 2.1 + |_ NoScript 2.5.2 + |_ HTTPS-Everywhere 2.2.1 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 1675e39..dc6d794 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.6esr +Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5 - |_ HTTPS-Everywhere 2.1 + |_ NoScript 2.5.2 + |_ HTTPS-Everywhere 2.2.1 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 6cb3ef9..6e8ae48 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.6esr +Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5 - |_ HTTPS-Everywhere 2.1 + |_ NoScript 2.5.2 + |_ HTTPS-Everywhere 2.2.1 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 170916b..b2e5f7b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ceb3e7..f08b50c 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e41d0f5..a082236 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -7,15 +7,15 @@ OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 -LIBEVENT_VER=2.0.19-stable +LIBEVENT_VER=2.0.20-stable TOR_VER=0.2.2.38 PIDGIN_VER=2.6.4 FIREFOX_VER=10.0.7esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.5 -HTTPSEVERYWHERE_VER=2.1 +NOSCRIPT_VER=2.5.2 +HTTPSEVERYWHERE_VER=2.2.1 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 0492f84..a871270 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 31149a2..c4b6d52 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.38-2); suite=linux + + * Update Firefox to 10.0.7esr + * Update Libevent to 2.0.20-stable + * Update NoScript to 2.5.2 + * Update HTTPS Everywhere to 2.2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:22 BST 2012 + Tor Browser Bundle (2.2.38-1); suite=linux * Update Tor to 0.2.2.38 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index f1c7681..d3b0776 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.38-2); suite=osx + + * Update Firefox to 10.0.7esr + * Update Libevent to 2.0.20-stable + * Update NoScript to 2.5.2 + * Update HTTPS Everywhere to 2.2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:24 BST 2012 + Tor Browser Bundle (2.2.38-1); suite=osx * Update Tor to 0.2.2.38 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 2d0fb2c..a604b2c 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.38-2); suite=windows + + * Update Firefox to 10.0.7esr + * Update Libevent to 2.0.20-stable + * Update NoScript to 2.5.2 + * Update HTTPS Everywhere to 2.2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 27 07:11:19 BST 2012 + Tor Browser Bundle (2.2.38-1); suite=windows * Update Tor to 0.2.2.38

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Aug '12

27 Aug '12

commit 18d1057df5a2e539d9d48552da3cad4962b5959e Merge: 0aafb37 2c75280 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 27 07:13:55 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 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 | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 45 insertions(+), 18 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.3'
by erinn＠torproject.org 27 Aug '12

27 Aug '12

commit 31c0e3c93b2d8b003ab30bb90c69c2f01e97f29a Merge: a1b4049 18d1057 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 27 07:14:01 2012 +0100 Merge branch 'maint-2.3' 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 | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 45 insertions(+), 18 deletions(-)

1 0

[metrics-web/master] Stop warning when Torperf data are stale.
by karsten＠torproject.org 27 Aug '12

27 Aug '12

commit 71b8d3a19108f74df286f964a59fd06b535e5ee1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 27 06:21:11 2012 +0200 Stop warning when Torperf data are stale. That's metrics-db's job, not metrics-web's. Having 1 hourly warning mail (from metrics-db) is enough. --- .../torproject/ernie/cron/TorperfProcessor.java | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/src/org/torproject/ernie/cron/TorperfProcessor.java b/src/org/torproject/ernie/cron/TorperfProcessor.java index ff64fb0..5d43150 100644 --- a/src/org/torproject/ernie/cron/TorperfProcessor.java +++ b/src/org/torproject/ernie/cron/TorperfProcessor.java @@ -255,9 +255,6 @@ public class TorperfProcessor { + "Last known obserations by source and file size are:"); String lastSource = null; String lastLine = null; - Level logLevel = Level.INFO; - String cutoff = formatter.format(System.currentTimeMillis() - - 12L * 60L * 60L * 1000L).replaceAll(",", " "); for (String s : rawObs.keySet()) { String[] parts = s.split(","); if (lastSource == null) { @@ -267,9 +264,6 @@ public class TorperfProcessor { + lastLine.split(",")[2]; dumpStats.append("\n" + lastSource + " " + lastKnownObservation); lastSource = parts[0]; - if (cutoff.compareTo(lastKnownObservation) > 0) { - logLevel = Level.WARNING; - } } lastLine = s; } @@ -277,11 +271,8 @@ public class TorperfProcessor { String lastKnownObservation = lastLine.split(",")[1] + " " + lastLine.split(",")[2]; dumpStats.append("\n" + lastSource + " " + lastKnownObservation); - if (cutoff.compareTo(lastKnownObservation) > 0) { - logLevel = Level.WARNING; - } } - logger.log(logLevel, dumpStats.toString()); + logger.info(dumpStats.toString()); /* Write results to database. */ if (connectionURL != null) {

1 0

[stem/master] Add Controller.is_feature_enabled
by atagar＠torproject.org 26 Aug '12

26 Aug '12

commit 17d536657c43984665138ee131e77a6a291176d5 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Wed Aug 22 23:45:49 2012 +0530 Add Controller.is_feature_enabled Also made some minor modifications based on CR in #6417 --- stem/control.py | 41 +++++++++++++++++++++++++++---------- stem/version.py | 3 +- test/integ/control/controller.py | 8 +++++- 3 files changed, 38 insertions(+), 14 deletions(-) diff --git a/stem/control.py b/stem/control.py index f2eb47a..8d59682 100644 --- a/stem/control.py +++ b/stem/control.py @@ -24,6 +24,7 @@ interacting at a higher level. |- set_options - sets or resets the values of multiple configuration options |- load_conf - loads configuration information as if it was in the torrc |- save_conf - saves configuration information to the torrc + |- is_feature_enabled - returns true if a given control connection feature is enabled |- enable_feature - enables control protocol features that have been disabled by default |- get_version - convenience method to get tor version |- authenticate - convenience method to authenticate the controller @@ -489,6 +490,7 @@ class Controller(BaseController): # number of sequental 'GETINFO ip-to-country/*' lookups that have failed self._geoip_failure_count = 0 + self.enabled_features = [] def connect(self): super(Controller, self).connect() @@ -964,6 +966,28 @@ class Controller(BaseController): else: raise stem.socket.ProtocolError("SAVECONF returned unexpected response code") + def is_feature_enabled(self, feature): + """ + Checks if a control connection feature is enabled. These features can be + enabled using :func:`stem.control.Controller.enable_feature`. + + :param str feature: feature to be checked + + :returns: True if feature is enabled, False otherwise + """ + + defaulted_version = None + + if feature == "EXTENDED_EVENTS": + defaulted_version = stem.version.Requirement.EXTENDED_EVENTS_DEFAULTED + elif feature == "VERBOSE_NAMES": + defaulted_version = stem.version.Requirement.VERBOSE_NAMES_DEFAULTED + + if defaulted_version and self.get_version().meets_requirements(defaulted_version): + return True + else: + return feature in self.enabled_features + def enable_feature(self, features): """ Enables features that are disabled by default to maintain backward @@ -972,21 +996,14 @@ class Controller(BaseController): disabled. Feature names are case-insensitive. The following features are currently accepted: - * EXTENDED_EVENTS - Requests the extended event syntax. Has the same - effect as calling SETEVENTS with EXTENDED. Introduced in - 0.1.2.3-alpha, always-on since Tor 0.2.2.1-alpha - * VERBOSE_NAMES - Replaces ServerID with LongName in events and GETINFO - results. LongName provides a Fingerprint for all routers, an indication - of Named status, and a Nickname if one is known. LongName is strictly - more informative than ServerID, which only provides either a Fingerprint - or a Nickname. Introduced in 0.1.2.2-alpha, always-on since Tor - 0.2.2.1-alpha. + * EXTENDED_EVENTS - Requests the extended event syntax + * VERBOSE_NAMES - Replaces ServerID with LongName in events and GETINFO results :param str,list features: a single feature or a list of features to be enabled :raises: - :class:`stem.socket.ControllerError` if the call fails - :class:`stem.socket.InvalidArguments` if features passed were invalid + * :class:`stem.socket.ControllerError` if the call fails + * :class:`stem.socket.InvalidArguments` if features passed were invalid """ if type(features) == str: features = [features] @@ -1000,6 +1017,8 @@ class Controller(BaseController): invalid_feature = [response.message[22:response.message.find("\"", 22)]] raise stem.socket.InvalidArguments(response.code, response.message, invalid_feature) raise stem.socket.ProtocolError("USEFEATURE returned invalid response code") + + self.enabled_features = list(set(self.enabled_features).union(features)) def _case_insensitive_lookup(entries, key, default = UNDEFINED): """ diff --git a/stem/version.py b/stem/version.py index e17d63b..90cc997 100644 --- a/stem/version.py +++ b/stem/version.py @@ -249,6 +249,7 @@ Requirement = stem.util.enum.Enum( ("LOADCONF", Version("0.2.1.1")), ("TORRC_CONTROL_SOCKET", Version("0.2.0.30")), ("TORRC_DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), - ("FEATURE_VERBOSENAMES", Version("0.1.2.2-alpha")), + ("VERBOSE_NAMES_DEFAULTED", Version("0.2.2.1-alpha")), + ("EXTENDED_EVENTS_DEFAULTED", Version("0.2.2.1-alpha")), ) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 88ef642..ea91c8c 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -4,9 +4,10 @@ Integration tests for the stem.control.Controller class. from __future__ import with_statement +import re +import shutil import unittest import tempfile -import shutil import stem.control import stem.socket @@ -327,8 +328,11 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - if test.runner.require_version(self, stem.version.Requirement.FEATURE_VERBOSENAMES): + if not test.runner.require_version(self, stem.version.Version("0.1.2.2-alpha")): controller.enable_feature("VERBOSE_NAMES") + self.assertTrue(re.match("\$[0-9a-fA-F]{40}[~=].*", controller.get_info('orconn-status').split()[0])) + self.assertTrue(controller.is_feature_enabled("VERBOSE_NAMES")) + self.assertTrue("VERBOSE_NAMES" in controller.enabled_features) self.assertRaises(stem.socket.InvalidArguments, controller.enable_feature, ["NOT", "A", "FEATURE"]) try: controller.enable_feature(["NOT", "A", "FEATURE"])

1 0