commit 0a9fb84816e8825303a8a6acccc4ab9ed696348b Author: Erinn Clark erinn@torproject.org Date: Fri Feb 3 00:49:03 2012 +0100

bump all tbb versions to 2.2.35-5 for firefox, openssl, qt, noscript, and https-everywhere updates --- README.LINUX-2.2 | 10 +++++----- README.OSX-2.2 | 10 +++++----- README.WIN-2.2 | 13 ++++++------- build-scripts/linux.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 13 +++++++++++++ changelog.osx-2.2 | 12 ++++++++++++ changelog.windows-2.2 | 14 ++++++++++++++ 9 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index fa8278a..3466964 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for GNU/Linux Included applications ---------------------

-Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0f) -Firefox (Aurora) 9.0.1 +Vidalia 0.2.15 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Firefox 10.0 _ Torbutton 1.4.5.1 - |_ NoScript 2.2.5 - |_ HTTPS-Everywhere 1.2.1 + |_ NoScript 2.2.8 + |_ HTTPS-Everywhere 1.2.2

Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index f5b4363..56fb53a 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Mac OS X Included applications ---------------------

-Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0f) -Firefox (Aurora) 9.0.1 +Vidalia 0.2.15 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Firefox 10.0 _ Torbutton 1.4.5.1 - |_ NoScript 2.2.5 - |_ HTTPS-Everywhere 1.2.1 + |_ NoScript 2.2.8 + |_ HTTPS-Everywhere 1.2.2

Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 6fa63a6..b586bd5 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,13 +4,12 @@ Tor Browser Bundle for Windows Included applications ---------------------

-Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0f) -FirefoxPortable 9.0.1 - _ Firefox (Aurora) 9.0.1 - _ Torbutton 1.4.5.1 - |_ NoScript 2.2.5 - |_ HTTPS-Everywhere 1.2.1 +Vidalia 0.2.15 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Firefox 10.0 + _ Torbutton 1.4.5.1 + |_ NoScript 2.2.8 + |_ HTTPS-Everywhere 1.2.2

Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 594e4d7..c8cfc88 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=4 +BUILD_NUM=5 PLATFORM=Linux

## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index ec85656..1ee01eb 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -2,12 +2,12 @@

RELEASE_VER=2.2.35

-HTTPSEVERY_VER=1.2.1 -FIREFOX_VER=9.0.1 +HTTPSEVERY_VER=1.2.2 +FIREFOX_VER=10.0 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.2.5 -OPENSSL_VER=1.0.0f +NOSCRIPT_VER=2.2.8 +OPENSSL_VER=1.0.0g OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 159f1b2..a8ddb91 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@

## Include versions include $(PWD)/versions.mk -BUILD_NUM=4 +BUILD_NUM=5 PLATFORM=Windows

## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index fb5e57c..cef8906 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,16 @@ +Tor Browser Bundle (2.2.35-5); suite=linux + + * Update Firefox to 10.0 + * Update Qt to 4.7.4 + * Update OpenSSL to 1.0.0g + * Update HTTPS Everywhere to 1.2.2 + * Update NoScript to 2.2.8 + * New Firefox patches + - Limit the number of fonts per document + * Put documentation in remove-shared-lib-symlinks debug dumps (closes: #4984) + + -- Erinn Clark erinn@torproject.org Fri Feb 3 00:17:09 CET 2012 + Tor Browser Bundle (2.2.35-4); suite=linux

* Update OpenSSL to 1.0.0f diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index a327aaf..80a7d10 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.35-5); suite=osx + + * Update Firefox to 10.0 + * Update Qt to 4.7.4 + * Update OpenSSL to 1.0.0g + * Update HTTPS Everywhere to 1.2.2 + * Update NoScript to 2.2.8 + * New Firefox patches + - Limit the number of fonts per document + + -- Erinn Clark erinn@torproject.org Fri Feb 3 00:14:24 CET 2012 + Tor Browser Bundle (2.2.35-4); suite=osx

* Update OpenSSL to 1.0.0f diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 36fd885..c465b79 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,17 @@ +Tor Browser Bundle (2.2.35-5); suite=windows + + * Update Firefox to 10.0 + * Update Qt to 4.7.4 + * Update OpenSSL to 1.0.0g + * Update HTTPS Everywhere to 1.2.2 + * Update NoScript to 2.2.8 + * New Firefox patches + - Limit the number of fonts per document + * Make sure mozconfig always gets copied into the Firefox build directory + (closes: #4879) + + -- Erinn Clark erinn@torproject.org Fri Feb 3 00:17:05 CET 2012 + Tor Browser Bundle (2.2.35-4); suite=windows

* Update OpenSSL to 1.0.0f