commit ab533c3e45d08d588b6d6e61a6ea70c617a4fb24 Author: Erinn Clark <erinn@torproject.org> Date: Tue Feb 5 18:12:40 2013 +0100 bump stable bundles to 2.2.35-3 for openssl 1.0.1d --- README.LINUX-2.3 | 6 +++--- README.OSX-2.3 | 6 +++--- README.WIN-2.3 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.3 | 8 ++++++++ changelog.osx-2.3 | 8 ++++++++ changelog.windows-2.3 | 8 ++++++++ 10 files changed, 39 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 612b5af..19db511 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1d) Firefox 10.0.12esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.4.2 - |_ HTTPS-Everywhere 3.1.2 + |_ NoScript 2.6.4.4 + |_ HTTPS-Everywhere 3.1.3 Usage ----- diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 1883159..2405545 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1d) Firefox 10.0.12esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.4.2 - |_ HTTPS-Everywhere 3.1.2 + |_ NoScript 2.6.4.4 + |_ HTTPS-Everywhere 3.1.3 Usage ----- diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 472c1f2..f8f766f 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1d) Firefox 10.0.12esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.4.2 - |_ HTTPS-Everywhere 3.1.2 + |_ NoScript 2.6.4.4 + |_ HTTPS-Everywhere 3.1.3 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 854bae5..cda9b7e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 39b0158..f420e46 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 05a098b..138b28d 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.3.25 ZLIB_VER=1.2.7 -OPENSSL_VER=1.0.1c +OPENSSL_VER=1.0.1d LIBPNG_VER=1.5.13 QT_VER=4.8.1 VIDALIA_VER=0.2.21 @@ -14,8 +14,8 @@ FIREFOX_VER=10.0.12esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.6.4.2 -HTTPSEVERYWHERE_VER=3.1.2 +NOSCRIPT_VER=2.6.4.4 +HTTPSEVERYWHERE_VER=3.1.3 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index cef0386..876973a 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index c366730..7592000 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-3); suite=linux + + * Update OpenSSL to 1.0.1d + * Update HTTPS Everywhere to 3.1.3 + * Update NoScript to 2.6.4.4 + + -- Erinn Clark <erinn@torproject.org> Tue Feb 5 18:08:43 CET 2013 + Tor Browser Bundle (2.3.25-2); suite=linux * Update Firefox to 10.0.12esr diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 040e1aa..d4e331a 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-3); suite=osx + + * Update OpenSSL to 1.0.1d + * Update HTTPS Everywhere to 3.1.3 + * Update NoScript to 2.6.4.4 + + -- Erinn Clark <erinn@torproject.org> Tue Feb 5 18:08:39 CET 2013 + Tor Browser Bundle (2.3.25-2); suite=osx * Update Firefox to 10.0.12esr diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 77c5bdc..990d0f2 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-3); suite=windows + + * Update OpenSSL to 1.0.1d + * Update HTTPS Everywhere to 3.1.3 + * Update NoScript to 2.6.4.4 + + -- Erinn Clark <erinn@torproject.org> Tue Feb 5 18:08:41 CET 2013 + Tor Browser Bundle (2.3.25-2); suite=windows * Update Firefox to 10.0.12esr