commit 637186da1c90fe0f41d724d13bb806124335922e Author: Erinn Clark <erinn@torproject.org> Date: Tue Oct 11 16:15:21 2011 +0100 bump vidalia to 0.2.14, torbutton to 1.4.4., noscript to 2.1.4, all tbb build nums for 2.2.33-3 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 11 +++++++++++ changelog.osx-2.2 | 11 +++++++++++ changelog.windows-2.2 | 11 +++++++++++ 10 files changed, 48 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 914b537..c6de227 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index dcb3e7e..1fa2a62 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 3cc6141..8faa57c 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) FirefoxPortable 7.0.1 \_ Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 090ee8e..76949f5 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=2 +BUILD_NUM=3 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 5d5dbc1..d131e85 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index f36759c..035566b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -6,14 +6,14 @@ HTTPSEVERY_VER=1.0.3 FIREFOX_VER=7.0.1 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.1.2.8 +NOSCRIPT_VER=2.1.4 OPENSSL_VER=1.0.0e OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 TOR_VER=0.2.2.33 -TORBUTTON_VER=1.4.3 -VIDALIA_VER=0.2.14 +TORBUTTON_VER=1.4.4 +VIDALIA_VER=0.2.15 ZLIB_VER=1.2.5 ## Extension IDs diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1d9bd04..19c433f 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 285914c..a6add26 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=linux + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn@torproject.org> Tue Oct 11 16:01:27 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=linux * Update Firefox to 7.0.1 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index ad31c2e..e9b6daa 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=osx + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn@torproject.org> Mon Oct 10 23:26:02 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=osx * Update Firefox to 7.0.1 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index f183ae4..4ccd526 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=windows + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn@torproject.org> Tue Oct 11 16:00:57 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=windows * Update Firefox to 7.0.1