commit cdc9067b126c9cf6e9ea5c62e16d816b83e8e8e9 Author: Erinn Clark <erinn@torproject.org> Date: Sat Aug 20 21:02:03 2011 +0200 bump experimental TBBs to 2.2.31, tor to 0.2.2.31-rc, Firefox to 6.0, update other versions too --- README.LINUX-2.2 | 9 ++++----- README.OSX-2.2 | 9 ++++----- README.WIN-2.2 | 9 ++++----- build-scripts/versions.mk | 14 +++++++------- changelog.linux-2.2 | 12 ++++++++++++ changelog.osx-2.2 | 14 +++++++++++++- changelog.win-2.2 | 14 +++++++++++++- 7 files changed, 57 insertions(+), 24 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index c871c74..47f2684 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,12 +5,11 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0.1 +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0 \_ Torbutton 1.4.0 - |_ NoScript 2.1.1.2 - |_ HTTPS-Everywhere 1.0.0development.4 - |_ BetterPrivacy 1.51 + |_ NoScript 2.1.2.6 + |_ HTTPS-Everywhere 1.0.0development.5 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 88564a6..750e540 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,12 +5,11 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0.1 +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0 \_ Torbutton 1.4.0 - |_ NoScript 2.1.1.2 - |_ HTTPS-Everywhere 1.0.0development.4 - |_ BetterPrivacy 1.51 + |_ NoScript 2.1.2.6 + |_ HTTPS-Everywhere 1.0.0development.5 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index dbe8ffb..519c64f 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,13 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) FirefoxPortable 5.0.1 - \_ Firefox (Aurora) 5.0.1 + \_ Firefox (Aurora) 6.0 \_ Torbutton 1.4.0 - |_ NoScript 2.1.1.2 - |_ HTTPS-Everywhere 1.0.0development.4 - |_ BetterPrivacy 1.51 + |_ NoScript 2.1.2.6 + |_ HTTPS-Everywhere 1.0.0development.5 Usage ----- diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index af23c30..e116326 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,21 +1,21 @@ #!/usr/bin/make -RELEASE_VER=2.2.30 +RELEASE_VER=2.2.31 -HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=5.0.1 -LIBEVENT_VER=2.0.12-stable +HTTPSEVERY_VER=1.0.0development.5 +FIREFOX_VER=6.0 +LIBEVENT_VER=2.0.13-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1.2 +NOSCRIPT_VER=2.1.2.6 OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.30-rc +TOR_VER=0.2.2.31-rc TORBUTTON_VER=1.4.0 VIDALIA_VER=0.2.12 -ZLIB_VER=1.2.5 +ZLIB_VER=1.4.0 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index f9119c5..20d8bc5 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=osx + + * Update Tor to 0.2.2.31-rc + * Update Firefox to 6.0 + * Update Libevent to 2.0.13-stable + * Update NoScript to 2.1.2.6 + * Update HTTPS Everywhere to 1.0.0development.5 + * Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + + -- Erinn Clark <erinn@torproject.org> Sat Aug 20 20:40:52 CEST 2011 + Tor Browser Bundle (2.2.30-1) alpha; suite=linux * Update Tor to 0.2.2.30-rc diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 888aaf5..ff6763d 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,8 +1,20 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=osx + + * Update Tor to 0.2.2.31-rc + * Update Firefox to 6.0 + * Update Libevent to 2.0.13-stable + * Update NoScript to 2.1.2.6 + * Update HTTPS Everywhere to 1.0.0development.5 + * Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + + -- Erinn Clark <erinn@torproject.org> Sat Aug 20 20:40:52 CEST 2011 + Tor Browser Bundle (2.2.30-2) alpha; suite=osx * Update Firefox to 5.0.1 - - Erinn Clark <erinn@torproject.org> Wed Jul 13 09:07:41 ART 2011 + -- Erinn Clark <erinn@torproject.org> Wed Jul 13 09:07:41 ART 2011 Tor Browser Bundle (2.2.30-1) alpha; suite=osx diff --git a/changelog.win-2.2 b/changelog.win-2.2 index ee916bc..bde8ad4 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,8 +1,20 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=osx + + * Update Tor to 0.2.2.31-rc + * Update Firefox to 6.0 + * Update Libevent to 2.0.13-stable + * Update NoScript to 2.1.2.6 + * Update HTTPS Everywhere to 1.0.0development.5 + * Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + + -- Erinn Clark <erinn@torproject.org> Sat Aug 20 20:40:52 CEST 2011 + Tor Browser Bundle (2.2.30-2) alpha; suite=windows * Update Firefox to 5.0.1 - - Erinn Clark <erinn@torproject.org> Wed Jul 13 09:07:41 ART 2011 + -- Erinn Clark <erinn@torproject.org> Wed Jul 13 09:07:41 ART 2011 Tor Browser Bundle (2.2.30-1) alpha; suite=windows