[tor-commits] [torbrowser/maint-2.2] bump tbb linux to 1.1.8 for tor 0.2.2.25-alpha and firefox 3.6.17 releases

[erinn at torproject.org]

commit f664edc19da163a3ccfa06ca437ee43acc72a2a4
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Apr 30 01:46:17 2011 +0300

    bump tbb linux to 1.1.8 for tor 0.2.2.25-alpha and firefox 3.6.17 releases
---
 README.Linux           |    8 ++++++--
 build-scripts/linux.mk |    6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.Linux b/README.Linux
index 02ed580..739c439 100644
--- a/README.Linux
+++ b/README.Linux
@@ -5,8 +5,8 @@ Included applications
 ---------------------
 
 Vidalia 0.2.12 (with Qt 4.6.2)
-Tor 0.2.2.24-alpha (with libevent-2.0.10-stable, zlib-1.2.3 and openssl-0.9.8p)
-Firefox 3.6.16
+Tor 0.2.2.25-alpha (with libevent-2.0.10-stable, zlib-1.2.3 and openssl-0.9.8p)
+Firefox 3.6.17
  \_ Torbutton 1.2.5
  |_ NoScript 2.1.0.1
  |_ BetterPrivacy 1.49
@@ -29,6 +29,10 @@ To exit, close Firefox. Vidalia will automatically clean up and exit.
 Changelog
 ---------
 
+1.1.8:  Released 2011-04-30
+        Update Tor to 0.2.2.25-alpha
+        Update Firefox to 3.6.17
+
 1.1.7:  Released 2011-04-12
         Update Tor to 0.2.2.24-alpha
         Update Vidalia to 0.2.12
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 3752465..a2cc481 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -42,7 +42,7 @@ TBB_FINAL=$(BUILT_DIR)/TBBL
 
 ## Versions for our source packages
 HTTPSEVERY_VER=0.9.9.development.4
-FIREFOX_VER=3.6.16
+FIREFOX_VER=3.6.17
 LIBEVENT_VER=2.0.10-stable
 LIBPNG_VER=1.4.3
 NOSCRIPT_VER=2.1.0.1
@@ -51,7 +51,7 @@ 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.24-alpha
+TOR_VER=0.2.2.25-alpha
 TORBUTTON_VER=1.2.5
 VIDALIA_VER=0.2.12
 ZLIB_VER=1.2.3
@@ -216,7 +216,7 @@ NAME=tor-browser
 DISTDIR=tbbl-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.1.7-dev
+VERSION=1.1.8-dev
 DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)-
 IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)