commit 308f2822d53c8fe6c72ee2051d63a030c25b6fe3 Author: Erinn Clark <erinn@torproject.org> Date: Sat Dec 1 15:15:23 2012 +0000 bump maint-2.3 versions for new stable TBBs --- README.LINUX-2.3 | 10 +++++----- README.OSX-2.3 | 10 +++++----- README.WIN-2.3 | 10 +++++----- build-scripts/edit-changelog.sh | 4 ++-- build-scripts/versions.mk | 8 ++++---- changelog.linux-2.3 | 6 +++--- changelog.osx-2.3 | 8 ++++---- changelog.windows-2.3 | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index d414141..a1476d7 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -1,15 +1,15 @@ -Tor Browser Bundle for GNU/Linux (alpha) +Tor Browser Bundle for GNU/Linux =============== Included applications --------------------- -Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.25-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Vidalia 0.2.21 (with Qt 4.8.1) +Tor 0.2.3.25 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.11esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.1 - |_ HTTPS-Everywhere 4.0development.2 + |_ NoScript 2.6.2 + |_ HTTPS-Everywhere 3.0.4 Usage ----- diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 3153c24..f8ddafb 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -1,15 +1,15 @@ -Tor Browser Bundle for Mac OS X (alpha) +Tor Browser Bundle for Mac OS X =============== Included applications --------------------- -Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.25-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Vidalia 0.2.21 (with Qt 4.8.1) +Tor 0.2.3.25 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.11esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.1 - |_ HTTPS-Everywhere 4.0development.2 + |_ NoScript 2.6.2 + |_ HTTPS-Everywhere 3.0.4 Usage ----- diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 384a1fb..343b2bf 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -1,15 +1,15 @@ -Tor Browser Bundle for Windows (alpha) +Tor Browser Bundle for Windows =============== Included applications --------------------- -Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.25-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Vidalia 0.2.21 (with Qt 4.8.1) +Tor 0.2.3.25 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.11esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.1 - |_ HTTPS-Everywhere 4.0development.2 + |_ NoScript 2.6.2 + |_ HTTPS-Everywhere 3.0.4 Usage ----- diff --git a/build-scripts/edit-changelog.sh b/build-scripts/edit-changelog.sh index 5d269de..4369d33 100755 --- a/build-scripts/edit-changelog.sh +++ b/build-scripts/edit-changelog.sh @@ -23,6 +23,6 @@ Tor Browser Bundle ($VERSION); suite=$1 EOF -mv ../changelog.$1-2.2 ../changelog.$1-2.2-old -cat ../tmp.changelog.$1 ../changelog.$1-2.2-old >> ../changelog.$1-2.2 +mv ../changelog.$1-2.3 ../changelog.$1-2.3-old +cat ../tmp.changelog.$1 ../changelog.$1-2.3-old >> ../changelog.$1-2.3 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 8cd07bc..75d9226 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,20 +1,20 @@ #!/usr/bin/make -RELEASE_VER=2.2.39 +RELEASE_VER=2.3.25 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.13 QT_VER=4.8.1 -VIDALIA_VER=0.2.20 +VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.20-stable -TOR_VER=0.2.2.39 +TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 FIREFOX_VER=10.0.11esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.6.1 +NOSCRIPT_VER=2.6.2 HTTPSEVERYWHERE_VER=3.0.4 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 71f37bb..2ad50d5 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,10 +1,10 @@ -Tor Browser Bundle (2.3.25-alpha-1); suite=linux +Tor Browser Bundle (2.3.25-1); suite=linux * Update Tor to 0.2.3.25-rc * Update Firefox 10.0.11esr - * Update NoScript to 2.6.1 + * Update NoScript to 2.6.2 - -- Erinn Clark <erinn@torproject.org> Tue Nov 20 14:22:59 GMT 2012 + -- Erinn Clark <erinn@torproject.org> Sat Dec 1 09:09:41 GMT 2012 Tor Browser Bundle (2.3.24-alpha-1); suite=linux diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index e5583a9..72d809d 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,10 +1,10 @@ -Tor Browser Bundle (2.3.25-alpha-1); suite=osx +Tor Browser Bundle (2.3.25-1); suite=osx - * Update Tor to 0.2.3.25-rc + * Update Tor to 0.2.3.25 * Update Firefox 10.0.11esr - * Update NoScript to 2.6.1 + * Update NoScript to 2.6.2 - -- Erinn Clark <erinn@torproject.org> Tue Nov 20 14:22:54 GMT 2012 + -- Erinn Clark <erinn@torproject.org> Sat Dec 1 09:09:41 GMT 2012 Tor Browser Bundle (2.3.24-alpha-1); suite=osx diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index bc6b09c..28eb587 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,10 +1,10 @@ -Tor Browser Bundle (2.3.25-alpha-1); suite=windows +Tor Browser Bundle (2.3.25-1); suite=windows - * Update Tor to 0.2.3.25-rc + * Update Tor to 0.2.3.25 * Update Firefox 10.0.11esr - * Update NoScript to 2.6.1 + * Update NoScript to 2.6.2 - -- Erinn Clark <erinn@torproject.org> Tue Nov 20 14:22:56 GMT 2012 + -- Erinn Clark <erinn@torproject.org> Sat Dec 1 09:09:41 GMT 2012 Tor Browser Bundle (2.3.24-alpha-1); suite=windows