[tor-commits] [torbrowser/master] bump osx ff4 bundle to 2.2.25-1-alpha

[erinn at torproject.org]

commit 6b9901d0d33d3f9d82e68ab161f2c13648a63ce5
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon May 2 04:19:17 2011 +0300

    bump osx ff4 bundle to 2.2.25-1-alpha
---
 README.OSX-2.2       |   12 ++++++------
 build-scripts/osx.mk |    2 +-
 changelog.osx-2.2    |    9 +++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/README.OSX-2.2 b/README.OSX-2.2
index 0daa56b..c2e35e7 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -4,13 +4,13 @@ Tor Browser Bundle for Mac OS X
 Included applications
 ---------------------
 
-Vidalia 0.2.10 (with Qt 4.6.2)
-Tor 0.2.2.23-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d)
-Firefox (Minefield) 4.0
- \_ Torbutton 1.3.2-alpha
- |_ NoScript 2.0.9.9
+Vidalia 0.2.12 (with Qt 4.6.2)
+Tor 0.2.2.25-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d)
+Firefox (Tumucumaque) 4.0.1
+ \_ Torbutton 1.3.3-alpha
+ |_ NoScript 2.1.0.3
  |_ HTTPS-Everywhere 0.9.9.development.4
- |_ BetterPrivacy 1.49
+ |_ BetterPrivacy 1.50
 
 Usage
 -----
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index c5e5f5a..fd4dd61 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -144,7 +144,7 @@ NAME=TorBrowser
 DISTDIR=tbbosx-alpha-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=2.2.24-1-alpha
+VERSION=2.2.25-1-alpha
 DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)-
 IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index c7643c9..173caad 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,3 +1,12 @@
+Tor Browser Bundle (2.2.25-1) alpha; suite=osx
+
+  * Update Tor to 0.2.2.25-alpha
+  * Update Torbutton to 1.3.3-alpha
+  * Update BetterPrivacy to 1.50
+  * Update NoScript to 2.1.0.3
+
+ -- Erinn Clark <erinn at torproject.org>  Tue May  3 11:49:53 IDT 2011
+
 Tor Browser Bundle (2.2.24-1) alpha; suite=osx
 
   * Update Tor to 0.2.2.24-alpha