[tor-commits] [torbrowser/maint-2.2] bump tbb osx to 1.0.20 and tor to 0.2.2.30-rc, update changelogs and readme

[erinn at torproject.org]

commit f547b5e55c9d48f1b99197d0b8c6760cb4f5a4d4
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Jul 11 16:59:37 2011 -0300

    bump tbb osx to 1.0.20 and tor to 0.2.2.30-rc, update changelogs and readme
---
 README.OSX           |   14 ++++++++++----
 build-scripts/osx.mk |   12 ++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/README.OSX b/README.OSX
index 04358e8..6cd757c 100644
--- a/README.OSX
+++ b/README.OSX
@@ -5,12 +5,12 @@ Included applications
 ---------------------
 
 Vidalia 0.2.12 (with Qt 4.6.2)
-Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p)
+Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p)
 Polipo 1.0.4.1
-Firefox 3.6.17
+Firefox 3.6.18
  \_ Torbutton 1.2.5
- |_ NoScript 2.1.1.1
- |_ HTTPS-Everywhere 0.9.9.development.6
+ |_ NoScript 2.1.1.2
+ |_ HTTPS-Everywhere 1.0.0development.4
  |_ BetterPrivacy 1.51
 
 Usage
@@ -24,6 +24,12 @@ To exit, close Firefox and Vidalia.
 Changelog
 ---------
 
+1.0.20: Released 2011-07-10
+        Update Tor to 0.2.2.30-rc
+        Update Firefox to 3.6.18
+        Update HTTPS-Everywhere to 1.0.0development.4
+        Update NoScript to 2.1.1.2
+
 1.0.19: Released 2011-06-21
         Update Tor to 0.2.2.29-beta
         Update NoScript to 2.1.1.1
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 6eca7be..2fa0a4d 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -41,17 +41,17 @@ BUILT_DIR=$(FETCH_DIR)/built
 TBB_FINAL=$(BUILT_DIR)/TBBL
 
 ## Versions for our source packages
-HTTPSEVERY_VER=0.9.9.development.6
-FIREFOX_VER=3.6.17
+HTTPSEVERY_VER=1.0.0development.4
+FIREFOX_VER=3.6.18
 LIBEVENT_VER=2.0.12-stable
 LIBPNG_VER=1.4.3
-NOSCRIPT_VER=2.1.1.1
+NOSCRIPT_VER=2.1.1.2
 OPENSSL_VER=0.9.8p
 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.29-beta
+TOR_VER=0.2.2.30-rc
 TORBUTTON_VER=1.2.5
 VIDALIA_VER=0.2.12
 ZLIB_VER=1.2.5
@@ -211,7 +211,7 @@ NAME=TorBrowser
 DISTDIR=tbbosx-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.0.19-dev
+VERSION=1.0.20-dev
 DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)-
 IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
@@ -227,7 +227,7 @@ endif
 DEFAULT_EXTENSIONS=torbutton.xpi
 
 ## Where to download Torbutton from
-TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VER).xpi
+TORBUTTON=https://archive.torproject.org/tor-package-archive/torbutton/torbutton-$(TORBUTTON_VER).xpi
 NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi
 BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi
 HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi