[tor-commits] [torbrowser/master] bump tbb osx to 2.2.32-1, tor to 0.2.2.32, vidalia to 0.2.14, torbutton to 1.4.1

[erinn at torproject.org]

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

    bump tbb osx to 2.2.32-1, tor to 0.2.2.32, vidalia to 0.2.14, torbutton to 1.4.1
---
 README.OSX-2.2            |    6 +++---
 build-scripts/versions.mk |    8 ++++----
 changelog.osx-2.2         |   11 ++++++++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/README.OSX-2.2 b/README.OSX-2.2
index 750e540..de6e27c 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -4,10 +4,10 @@ Tor Browser Bundle for Mac OS X
 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/build-scripts/versions.mk b/build-scripts/versions.mk
index 28b7d82..d3fa14b 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -1,6 +1,6 @@
 #!/usr/bin/make
 
-RELEASE_VER=2.2.31
+RELEASE_VER=2.2.32
 
 HTTPSEVERY_VER=1.0.0development.5
 FIREFOX_VER=6.0
@@ -12,9 +12,9 @@ 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.31-rc
-TORBUTTON_VER=1.4.0
-VIDALIA_VER=0.2.12
+TOR_VER=0.2.2.32
+TORBUTTON_VER=1.4.1
+VIDALIA_VER=0.2.14
 ZLIB_VER=1.4.0
 
 ## Extension IDs
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index ff6763d..2b9edcb 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,4 +1,13 @@
-Tor Browser Bundle (2.2.30-1) alpha; suite=osx
+Tor Browser Bundle (2.2.32-1) alpha; suite=osx
+
+  * 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=osx
 
   * Update Tor to 0.2.2.31-rc
   * Update Firefox to 6.0