commit 843fec9f63d7dbdd804899e701bf5195933ec162 Author: Erinn Clark erinn@torproject.org Date: Mon Jul 11 17:35:54 2011 -0300

bump tbb win to 1.3.25 and firefox to 3.6.18 --- README | 13 +++++++++---- build-scripts/Makefile | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/README b/README index ef0808e..2afd038 100644 --- a/README +++ b/README @@ -5,12 +5,12 @@ Included applications ---------------------

Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.1.30 (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.1.30 (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 -FirefoxPortable 3.6.17 - _ Firefox 3.6.17 +FirefoxPortable 3.6.18 + _ Firefox 3.6.18 _ Torbutton 1.2.5 - _ HTTPS Everywhere 0.9.9.development.4 + _ HTTPS Everywhere 1.0.0development.4 PidginPortable 2.7.4 _ Pidgin 2.7.5 _ OTR 3.2 @@ -346,3 +346,8 @@ Changelog Update Libevent to 2.0.10-stable Update zlib to 1.2.5 Update OpenSSL to 1.0.0d + +1.3.25: Released 2011-06-11 + Update Firefox to 3.6.18 + Update Libevent to 2.0.12-stable + Update HTTPS-Everywhere to 1.0.0development.4 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index ad82762..97085bb 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,7 +18,7 @@ OPENSSL=/e/build/openssl-0.9.8p/

## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.17 +FIREFOX_VERSION=3.6.18 PIDGIN_VERSION=2.7.5

## Location of bundle components @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser"

## Version and name of the compressed bundle (also used for source) -VERSION=1.3.24 +VERSION=1.3.25 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)