[tor-commits] [torbrowser/master] bump tbb ff4 win version to 2.2.29, bump extension and libevent version, add forbidWebGL option to firefox prefs

[erinn at torproject.org]

commit 21fcc4e7c03093f2dd3e425a5b1621c4b0f04858
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Jun 21 18:05:53 2011 -0300

    bump tbb ff4 win version to 2.2.29, bump extension and libevent version, add forbidWebGL option to firefox prefs
---
 README.WIN-2.2                      |    8 ++++----
 build-scripts/config/windows-4.0.js |    1 +
 build-scripts/windows.mk            |    2 +-
 changelog.win-2.2                   |   10 ++++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/README.WIN-2.2 b/README.WIN-2.2
index 69acdac..cf382c8 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -5,14 +5,14 @@ Included applications
 ---------------------
 
 Vidalia 0.2.12 (with Qt 4.6.2)
-Tor 0.2.2.27-beta (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d)
+Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d)
 Polipo 1.0.4.1
 FirefoxPortable 4.0.1
  \_ Firefox 4.0.1
     \_ Torbutton 1.3.3-alpha
-    |_ NoScript 2.1.0.5
-    |_ HTTPS-Everywhere 0.9.9.development.5
-    |_ BetterPrivacy 1.50
+    |_ NoScript 2.1.1.1
+    |_ HTTPS-Everywhere 0.9.9.development.6
+    |_ BetterPrivacy 1.51
 
 Usage
 -----
diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js
index ac20369..fc73c6c 100644
--- a/build-scripts/config/windows-4.0.js
+++ b/build-scripts/config/windows-4.0.js
@@ -133,6 +133,7 @@ user_pref("noscript.autoReload", false);
 user_pref("noscript.contentBlocker", true);
 user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com");
 user_pref("noscript.firstRunRedirection", false);
+user_pref("noscript.forbidWebGL", true);
 user_pref("noscript.global", true);
 user_pref("noscript.gtemp", "");
 user_pref("noscript.opacizeObject", 3);
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 9bb2c4a..4100940 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -144,7 +144,7 @@ NAME="Tor Browser"
 DISTDIR=tbbwin-alpha-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=2.2.25-1-alpha
+VERSION=$(RELEASE_VER)-1-alpha
 DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION)
 IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION)
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
diff --git a/changelog.win-2.2 b/changelog.win-2.2
index 2acec07..19c2e12 100644
--- a/changelog.win-2.2
+++ b/changelog.win-2.2
@@ -1,3 +1,13 @@
+Tor Browser Bundle (2.2.29-1) alpha; suite=windows
+
+  * Update Tor to 0.2.2.29-beta
+  * Update Libevent to 2.0.12-stable
+  * Update HTTPS Everywhere to 0.9.9.development.6
+  * Update NoScript to 2.1.1.1
+  * Update BetterPrivacy to 1.51
+
+ -- Erinn Clark <erinn at torproject.org>  Tue Jun 21 18:00:51 ART 2011
+
 Tor Browser Bundle (2.2.27-1) alpha; suite=windows
 
   * Update Tor to 0.2.2.27-beta