commit 6548f37aa21af88c8d2d6a9ec2297f6f30995d39 Author: Erinn Clark erinn@torproject.org Date: Sun Mar 6 15:13:12 2011 -0800

bump tbb windows to 1.3.20 for firefox 3.6.15 --- README | 7 +++++-- build-scripts/Makefile | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README b/README index b0fb5ec..9bc21fd 100644 --- a/README +++ b/README @@ -7,8 +7,8 @@ Included applications Vidalia 0.2.10 (with Qt 4.6.2) Tor 0.2.1.30 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) Polipo 1.0.4.1 -FirefoxPortable 3.6.14 - _ Firefox 3.6.13 +FirefoxPortable 3.6.15 + _ Firefox 3.6.15 _ Torbutton 1.2.5 _ HTTPS Everywhere 0.9.9.development.3 PidginPortable 2.7.4 @@ -327,3 +327,6 @@ Changelog

1.3.19: Released 2011-03-03 Update Firefox to 3.6.14 + +1.3.20: Released 2011-03-07 + Update Firefox to 3.6.15 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index e88d212..f847211 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,14 +18,14 @@ OPENSSL=/e/build/openssl-0.9.8p/

## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.14 +FIREFOX_VERSION=3.6.15 PIDGIN_VERSION=2.7.5

## Location of bundle components VIDALIA=/e/build/vidalia-0.2.10 TOR=/e/build/tor-0.2.1.30 POLIPO=/e/build/polipo-1.0.4.1 -FIREFOX_SRC=/e/build/FirefoxPortable-3.6.14 +FIREFOX_SRC=/e/build/FirefoxPortable-3.6.15 PIDGIN_SRC=/e/build/PidginPortable-2.7.5

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

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