commit 2c75280860ead77ce2969d8179ec34087382d545 Author: Erinn Clark erinn@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@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@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@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