commit 3e3b5f3396b70747a11f2904adb1f551d66ac814 Author: Erinn Clark erinn@torproject.org Date: Fri Jan 4 11:58:11 2013 +0100
bump alpha TBBs to 0.2.4.7-alpha-1 for Tor and Firefox updates --- README.LINUX-2.4 | 8 ++++---- README.OSX-2.4 | 8 ++++---- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 12 ++++++------ build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.4 | 10 ++++++++++ changelog.osx-2.4 | 10 ++++++++++ changelog.windows-2.4 | 10 ++++++++++ 9 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 6a404d5..f455467 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -5,11 +5,11 @@ Included applications ---------------------
Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.6-alpha (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.11esr +Tor 0.2.4.7-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.12esr _ Torbutton 1.4.6.3 - |_ NoScript 2.6.2 - |_ HTTPS-Everywhere 4.0development.2 + |_ NoScript 2.6.4.2 + |_ HTTPS-Everywhere 4.0development.4
Usage ----- diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 703353d..e35ebf5 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -5,11 +5,11 @@ Included applications ---------------------
Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.6-alpha (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.11esr +Tor 0.2.4.7-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.12esr _ Torbutton 1.4.6.3 - |_ NoScript 2.6.2 - |_ HTTPS-Everywhere 4.0development.2 + |_ NoScript 2.6.4.2 + |_ HTTPS-Everywhere 4.0development.4
Usage ----- diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index ca3a362..a08466b 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@
## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Linux
## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 665ce4a..3c1e050 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@
## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS
## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 6fd7e61..87e3695 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,21 +1,21 @@ #!/usr/bin/make
-RELEASE_VER=2.4.6-alpha +RELEASE_VER=2.4.7-alpha
ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.13 QT_VER=4.8.1 VIDALIA_VER=0.2.21 -LIBEVENT_VER=2.0.20-stable -TOR_VER=0.2.4.6-alpha +LIBEVENT_VER=2.0.21-stable +TOR_VER=0.2.4.7-alpha PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.11esr +FIREFOX_VER=10.0.12esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.6.1 -HTTPSEVERYWHERE_VER=4.0development.2 +NOSCRIPT_VER=2.6.4.2 +HTTPSEVERYWHERE_VER=4.0development.4 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index c9837a3..9b4efb6 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### #####################
-BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows
## Location of required libraries diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 314cf68..9420b53 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.7-alpha-1); suite=linux + + * Update Firefox to 10.0.12esr + * Update Tor to 0.2.4.7-alpha + * Update Libevent to 2.0.21-stable + * Update HTTPS Everywhere to 4.0development.4 + * Update NoScript to 2.6.4.2 + + -- Erinn Clark erinn@torproject.org Fri Jan 4 11:55:05 CET 2013 + Tor Browser Bundle (2.4.6-alpha-2); suite=linux
* Update Makefiles to use the right changelogs and READMEs diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index f822f4e..ecf1347 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.7-alpha-1); suite=osx + + * Update Firefox to 10.0.12esr + * Update Tor to 0.2.4.7-alpha + * Update Libevent to 2.0.21-stable + * Update HTTPS Everywhere to 4.0development.4 + * Update NoScript to 2.6.4.2 + + -- Erinn Clark erinn@torproject.org Fri Jan 4 11:55:00 CET 2013 + Tor Browser Bundle (2.4.6-alpha-2); suite=osx
* Update Makefiles to use the right changelogs and READMEs diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 2a18e45..3d050ad 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.7-alpha-1); suite=windows + + * Update Firefox to 10.0.12esr + * Update Tor to 0.2.4.7-alpha + * Update Libevent to 2.0.21-stable + * Update HTTPS Everywhere to 4.0development.4 + * Update NoScript to 2.6.4.2 + + -- Erinn Clark erinn@torproject.org Fri Jan 4 11:55:02 CET 2013 + Tor Browser Bundle (2.4.6-alpha-2); suite=windows
* Update Makefiles to use the right changelogs and READMEs