commit 376ea7c1aff4a30b9bb8036919691ca4ff0b0d11 Author: Erinn Clark erinn@torproject.org Date: Sat Apr 30 01:41:49 2011 +0300

bump tbb osx to 1.0.17 for tor 0.2.2.25-alpha and firefox 3.6.17 releases --- README.OSX | 8 ++++++-- build-scripts/osx.mk | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.OSX b/README.OSX index a3b876f..6f3a530 100644 --- a/README.OSX +++ b/README.OSX @@ -5,9 +5,9 @@ Included applications ---------------------

Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.24-alpha (with libevent-2.0.10-stable, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.2.25-alpha (with libevent-2.0.10-stable, zlib-1.2.3 and openssl-0.9.8p) Polipo 1.0.4.1 -Firefox 3.6.16 +Firefox 3.6.17 _ Torbutton 1.2.5 |_ NoScript 2.1.0.1 |_ HTTPS-Everywhere 0.9.9.development.4 @@ -24,6 +24,10 @@ To exit, close Firefox and Vidalia. Changelog ---------

+1.0.16: Released 2011-04-30 + Update Tor to 0.2.2.25-alpha + Update Firefox to 3.6.17 + 1.0.15: Released 2011-04-11 Update Tor to 0.2.2.24-alpha Update Vidalia to 0.2.12 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index be3bfb9..b933d11 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -42,7 +42,7 @@ TBB_FINAL=$(BUILT_DIR)/TBBL

## Versions for our source packages HTTPSEVERY_VER=0.9.9.development.4 -FIREFOX_VER=3.6.16 +FIREFOX_VER=3.6.17 LIBEVENT_VER=2.0.10-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.0.1 @@ -51,7 +51,7 @@ 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.24-alpha +TOR_VER=0.2.2.25-alpha TORBUTTON_VER=1.2.5 VIDALIA_VER=0.2.12 ZLIB_VER=1.2.3 @@ -208,7 +208,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist

## Version and name of the compressed bundle (also used for source) -VERSION=1.0.15-dev +VERSION=1.0.16-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)