commit d3b0d1bca00c6edf0966e654aaddcb9f222c9415 Author: Erinn Clark erinn@torproject.org Date: Fri May 11 21:01:43 2012 -0300

bump all tbbs to 2.2.35-12 for openssl 1.0.1c, libevent 2.0.19-stable --- README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index f6b803a..f379cce 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,10 +5,10 @@ Included applications ---------------------

Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 _ Torbutton 1.4.5.1 - |_ NoScript 2.3.9 + |_ NoScript 2.4.1 |_ HTTPS-Everywhere 2.0.2

Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index ccb11c1..ebe97b4 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,10 +5,10 @@ Included applications ---------------------

Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 _ Torbutton 1.4.5.1 - |_ NoScript 2.3.9 + |_ NoScript 2.4.1 |_ HTTPS-Everywhere 2.0.2

Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index bb9c1b8..a3bac24 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,10 +5,10 @@ Included applications ---------------------

Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 _ Torbutton 1.4.5.1 - |_ NoScript 2.3.9 + |_ NoScript 2.4.1 |_ HTTPS-Everywhere 2.0.2

Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 0584ec7..49d3d2e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@

## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=Linux

## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 2a4c704..bfc628d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@

## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=MacOS

## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index eea574e..fdd3902 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -14,7 +14,7 @@ FIREFOX_VER=12.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1 -NOSCRIPT_VER=2.3.9 +NOSCRIPT_VER=2.4.1 HTTPSEVERYWHERE_VER=2.0.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4cc2c67..16ff624 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### #####################

-BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=Windows

## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index ec5d245..db2edfa 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-12); suite=linux + + * Update OpenSSL to 1.0.1c + * Update Libevent to 2.0.19-stable + * Update zlib to 1.2.7 + * Update NoScript to 2.4.1 + + -- Erinn Clark erinn@torproject.org Fri May 11 20:16:14 BRT 2012 + Tor Browser Bundle (2.2.35-11); suite=linux

* Security release to stop TorBrowser from bypassing SOCKS proxy DNS diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 4c00da6..f432023 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-12); suite=osx + + * Update OpenSSL to 1.0.1c + * Update Libevent to 2.0.19-stable + * Update zlib to 1.2.7 + * Update NoScript to 2.4.1 + + -- Erinn Clark erinn@torproject.org Fri May 11 20:16:04 BRT 2012 + Tor Browser Bundle (2.2.35-11); suite=osx

* Security release to stop TorBrowser from bypassing SOCKS proxy DNS diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index ea5f86b..fe7680a 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-12); suite=windows + + * Update OpenSSL to 1.0.1c + * Update Libevent to 2.0.19-stable + * Update zlib to 1.2.7 + * Update NoScript to 2.4.1 + + -- Erinn Clark erinn@torproject.org Fri May 11 20:16:10 BRT 2012 + Tor Browser Bundle (2.2.35-11); suite=windows

* Security release to stop TorBrowser from bypassing SOCKS proxy DNS