[tor-commits] [torbrowser/maint-2.2] bump tbb linux to 1.1.11-dev, tor to 0.2.2.29-beta

[erinn at torproject.org]

commit 6ff7e56073519d2b1ceee8e2fd7d4e4aee863895
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Jun 21 19:12:17 2011 -0300

    bump tbb linux to 1.1.11-dev, tor to 0.2.2.29-beta
---
 README.Linux           |   11 ++++++++---
 build-scripts/linux.mk |    8 ++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.Linux b/README.Linux
index 37c165c..05ea71b 100644
--- a/README.Linux
+++ b/README.Linux
@@ -5,12 +5,12 @@ Included applications
 ---------------------
 
 Vidalia 0.2.12 (with Qt 4.6.2)
-Tor 0.2.2.28-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p)
+Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p)
 Firefox 3.6.17
  \_ Torbutton 1.2.5
- |_ NoScript 2.1.1
+ |_ NoScript 2.1.1.1
  |_ BetterPrivacy 1.51
- |_ HTTPS Everywhere 0.9.9.development.5
+ |_ HTTPS Everywhere 0.9.9.development.6
 
 Usage
 -----
@@ -29,6 +29,11 @@ To exit, close Firefox. Vidalia will automatically clean up and exit.
 Changelog
 ---------
 
+1.1.11: Released 2011-06-21
+        Update Tor to 0.2.2.29-beta
+        Update NoScript to 2.1.1.1
+        Update HTTPS-Everywhere to 0.9.9.development.6
+
 1.1.10: Released 2011-06-05
         Update Tor to 0.2.2.28-beta
         Update Libevent to 2.0.12-stable
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index a58756e..079c21a 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.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.5
+HTTPSEVERY_VER=0.9.9.development.6
 FIREFOX_VER=3.6.17
 LIBEVENT_VER=2.0.12-stable
 LIBPNG_VER=1.4.3
-NOSCRIPT_VER=2.1.1
+NOSCRIPT_VER=2.1.1.1
 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.28-beta
+TOR_VER=0.2.2.29-beta
 TORBUTTON_VER=1.2.5
 VIDALIA_VER=0.2.12
 ZLIB_VER=1.2.5
@@ -216,7 +216,7 @@ NAME=tor-browser
 DISTDIR=tbbl-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.1.10-dev
+VERSION=1.1.11-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)