commit c1bc3353c0e74a59d896811e26cb9fb0cd6444ab Author: Erinn Clark erinn@torproject.org Date: Fri Aug 19 15:52:36 2011 +0200

bump tbb osx to 1.0.23-dev, update tor to 0.2.2.31-rc, vidalia to 0.2.13, firefox to 3.6.20, libevent to 2.0.13-stable, remove betterprivacy, and update noscript and https-everywhere too --- README.OSX | 21 +++++++++++++++------ build-scripts/osx.mk | 14 +++++++------- 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/README.OSX b/README.OSX index 08ca414..cea0edf 100644 --- a/README.OSX +++ b/README.OSX @@ -4,14 +4,13 @@ Tor Browser Bundle for Mac OS X 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-0.9.8p) +Vidalia 0.2.13 (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) Polipo 1.0.4.1 -Firefox 3.6.19 +Firefox 3.6.20 _ Torbutton 1.2.5 - |_ 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 ----- @@ -24,6 +23,16 @@ To exit, close Firefox and Vidalia. Changelog ---------

+1.0.23: Released 2011-08-19 + Update Tor to 0.2.2.31-rc + Update Vidalia to 0.2.13 + Update Firefox to 3.6.20 + 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) + 1.0.22: Released 2011-07-13 Update Firefox to 3.6.19

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 0269494..bbcddb5 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -41,19 +41,19 @@ BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL

## Versions for our source packages -HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=3.6.19 -LIBEVENT_VER=2.0.12-stable +HTTPSEVERY_VER=1.0.0development.5 +FIREFOX_VER=3.6.20 +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=0.9.8p 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.2.5 -VIDALIA_VER=0.2.12 +VIDALIA_VER=0.2.13 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.22-dev +VERSION=1.0.23-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)