commit 52906e824349bc4dc6aa7c838608504221c0a152 Author: Erinn Clark erinn@torproject.org Date: Sun Aug 28 00:58:47 2011 +0100
bump all tbbs to new tor stable 0.2.2.32 and vidalia 0.2.14 --- README | 8 ++++++-- README.Linux | 8 ++++++-- README.OSX | 8 ++++++-- build-scripts/Makefile | 6 +++--- build-scripts/linux.mk | 6 +++--- build-scripts/osx.mk | 6 +++--- 6 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/README b/README index d7e2cee..0d7c119 100644 --- a/README +++ b/README @@ -4,8 +4,8 @@ Tor USB project Included applications ---------------------
-Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.1.30 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +Vidalia 0.2.14 (with Qt 4.6.2) +Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 FirefoxPortable 3.6.20 _ Firefox 3.6.20 @@ -359,3 +359,7 @@ Changelog Update Firefox to 3.6.20 Update Libevent to 2.0.13-stable Update HTTPS-Everywhere to 1.0.0development.5 + +1.3.28: Released 2011-08-28 + Update Tor to 0.2.2.32 + Update Vidalia to 0.2.14 diff --git a/README.Linux b/README.Linux index 60b8bce..21b2a04 100644 --- a/README.Linux +++ b/README.Linux @@ -4,8 +4,8 @@ Tor Browser Bundle for GNU/Linux Included applications ---------------------
-Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-0.9.8p) +Vidalia 0.2.14 (with Qt 4.6.2) +Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-0.9.8p) Firefox 3.6.20 _ Torbutton 1.2.5 |_ NoScript 2.1.2.6 @@ -28,6 +28,10 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog ---------
+1.1.14: Released 2011-08-28 + Update Tor to 0.2.2.32 + Update Vidalia to 0.2.14 + 1.1.13: Released 2011-08-19 Update Tor to 0.2.2.31-rc Update Firefox to 3.6.20 diff --git a/README.OSX b/README.OSX index a5c6673..f9fb0b9 100644 --- a/README.OSX +++ b/README.OSX @@ -4,8 +4,8 @@ Tor Browser Bundle for Mac OS X Included applications ---------------------
-Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-0.9.8p) +Vidalia 0.2.14 (with Qt 4.6.2) +Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-0.9.8p) Polipo 1.0.4.1 Firefox 3.6.20 _ Torbutton 1.2.5 @@ -23,6 +23,10 @@ To exit, close Firefox and Vidalia. Changelog ---------
+1.0.24: Released 2011-08-28 + Update Tor to 0.2.2.32 + Update Vidalia to 0.2.14 + 1.0.23: Released 2011-08-19 Update Tor to 0.2.2.31-rc Update Firefox to 3.6.20 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index caecf1d..e6958c1 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -22,8 +22,8 @@ FIREFOX_VERSION=3.6.20 PIDGIN_VERSION=2.7.5
## Location of bundle components -VIDALIA=/e/build/vidalia-0.2.12 -TOR=/e/build/tor-0.2.1.30 +VIDALIA=/e/build/vidalia-0.2.14 +TOR=/e/build/tor-0.2.2.32 POLIPO=/e/build/polipo-1.0.4.1 FIREFOX_SRC=/e/build/FirefoxPortable-$(FIREFOX_VERSION) PIDGIN_SRC=/e/build/PidginPortable-$(PIDGIN_VERSION) @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser"
## Version and name of the compressed bundle (also used for source) -VERSION=1.3.27 +VERSION=1.3.28 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index deba909..3b8511c 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -51,9 +51,9 @@ 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.31-rc +TOR_VER=0.2.2.32 TORBUTTON_VER=1.2.5 -VIDALIA_VER=0.2.12 +VIDALIA_VER=0.2.14 ZLIB_VER=1.2.5
## Extension IDs @@ -216,7 +216,7 @@ NAME=tor-browser DISTDIR=tbbl-dist
## Version and name of the compressed bundle (also used for source) -VERSION=1.1.13-dev +VERSION=1.1.14-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d101ec1..0fa0a91 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -51,9 +51,9 @@ 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.31-rc +TOR_VER=0.2.2.32 TORBUTTON_VER=1.2.5 -VIDALIA_VER=0.2.12 +VIDALIA_VER=0.2.14 ZLIB_VER=1.2.5
## Extension IDs @@ -211,7 +211,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist
## Version and name of the compressed bundle (also used for source) -VERSION=1.0.23-dev +VERSION=1.0.24-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)