[tor-commits] [torbrowser/master] update windows and linux to 2.2.32-1 as well

[erinn at torproject.org]

commit 17c0d034c0e078a9a4e6353a2e7a8279d4f3a72b
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Aug 28 19:21:48 2011 +0100

    update windows and linux to 2.2.32-1 as well
---
 README.LINUX-2.2         |    6 +++---
 README.WIN-2.2           |    8 ++++----
 build-scripts/windows.mk |    2 +-
 changelog.linux-2.2      |    9 +++++++++
 changelog.win-2.2        |   11 ++++++++++-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index 47f2684..176ee30 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -4,10 +4,10 @@ Tor Browser Bundle for GNU/Linux
 Included applications
 ---------------------
 
-Vidalia 0.2.12 (with Qt 4.6.2)
-Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d)
+Vidalia 0.2.14 (with Qt 4.6.2)
+Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d)
 Firefox (Aurora) 6.0
- \_ Torbutton 1.4.0
+ \_ Torbutton 1.4.1
  |_ NoScript 2.1.2.6
  |_ HTTPS-Everywhere 1.0.0development.5
 
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index 519c64f..5ab55a0 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -4,11 +4,11 @@ Tor Browser Bundle for Windows
 Included applications
 ---------------------
 
-Vidalia 0.2.12 (with Qt 4.6.2)
-Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d)
-FirefoxPortable 5.0.1
+Vidalia 0.2.14 (with Qt 4.6.2)
+Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d)
+FirefoxPortable 6.0
  \_ Firefox (Aurora) 6.0
-    \_ Torbutton 1.4.0
+    \_ Torbutton 1.4.1
     |_ NoScript 2.1.2.6
     |_ HTTPS-Everywhere 1.0.0development.5
 
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 1a52f6a..294b2c6 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -138,7 +138,7 @@ NAME="Tor Browser"
 DISTDIR=tbbwin-alpha-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=$(RELEASE_VER)-2-alpha
+VERSION=$(RELEASE_VER)-1-alpha
 DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION)
 IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION)
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
diff --git a/changelog.linux-2.2 b/changelog.linux-2.2
index 1d29228..6d49e4a 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,12 @@
+Tor Browser Bundle (2.2.32-1) alpha; suite=linux
+
+  * Update Tor to 0.2.2.32
+  * Update Vidalia to 0.2.14
+  * Update Torbutton to 1.4.1
+  * Enable automatic port choosing (closes: #2264)
+
+ -- Erinn Clark <erinn at torproject.org>  Sun Aug 28 17:20:46 BST 2011
+
 Tor Browser Bundle (2.2.31-2) alpha; suite=linux
 
   * Fix x86_64 bundle to have the right libraries and binaries (closes: #3773)
diff --git a/changelog.win-2.2 b/changelog.win-2.2
index bc070ec..96eae99 100644
--- a/changelog.win-2.2
+++ b/changelog.win-2.2
@@ -1,4 +1,13 @@
-Tor Browser Bundle (2.2.30-1) alpha; suite=windows
+Tor Browser Bundle (2.2.32-1) alpha; suite=windows
+
+  * Update Tor to 0.2.2.32
+  * Update Vidalia to 0.2.14
+  * Update Torbutton to 1.4.1
+  * Enable automatic port choosing (closes: #2264)
+
+ -- Erinn Clark <erinn at torproject.org>  Sun Aug 28 17:20:46 BST 2011
+
+Tor Browser Bundle (2.2.31-1) alpha; suite=windows
 
   * Update Tor to 0.2.2.31-rc
   * Update Firefox to 6.0