commit 7a8765f0bb3c3fc3eb8affdf753d7272691ffbe3 Author: Erinn Clark erinn@torproject.org Date: Fri Sep 30 16:34:22 2011 +0100

bump all tbb versions, update changelogs and readmes for firefox 7.0.1 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 6 ++++++ changelog.osx-2.2 | 6 ++++++ changelog.windows-2.2 | 6 ++++++ 9 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 5448f89..914b537 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,7 +6,7 @@ Included applications

Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) -Firefox (Aurora) 7.0 +Firefox (Aurora) 7.0.1 _ Torbutton 1.4.3 |_ NoScript 2.1.2.8 |_ HTTPS-Everywhere 1.0.3 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index fd6ae31..dcb3e7e 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,7 +6,7 @@ Included applications

Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 7.0 +Firefox (Aurora) 7.0.1 _ Torbutton 1.4.3 |_ NoScript 2.1.2.8 |_ HTTPS-Everywhere 1.0.3 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index bd27aa1..3cc6141 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,8 +6,8 @@ Included applications

Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) -FirefoxPortable 7.0 - _ Firefox (Aurora) 7.0 +FirefoxPortable 7.0.1 + _ Firefox (Aurora) 7.0.1 _ Torbutton 1.4.3 |_ NoScript 2.1.2.8 |_ HTTPS-Everywhere 1.0.3 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index c37447d..bd16d4d 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk

## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux

## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 1ea955b..d2de9dc 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk

## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS

## Location of directory for source unpacking diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 739317f..b3e199c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@

## Include versions include $(PWD)/versions.mk -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows

## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index df90085..285914c 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.33-2); suite=linux + + * Update Firefox to 7.0.1 + + -- Erinn Clark erinn@torproject.org Fri Sep 30 16:32:50 BST 2011 + Tor Browser Bundle (2.2.33-1); suite=linux

* Update Firefox to 7 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 75eb8d8..ad31c2e 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.33-2); suite=osx + + * Update Firefox to 7.0.1 + + -- Erinn Clark erinn@torproject.org Fri Sep 30 16:31:59 BST 2011 + Tor Browser Bundle (2.2.33-1); suite=osx

* Update Firefox to 7 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 510cac2..f183ae4 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.33-2); suite=windows + + * Update Firefox to 7.0.1 + + -- Erinn Clark erinn@torproject.org Fri Sep 30 16:32:33 BST 2011 + Tor Browser Bundle (2.2.33-1); suite=windows

* Update Firefox to 7