[or-cvs] [torbrowser/master 4/4] update Firefox to 3.6.11 and fix wanIpAsLocal option to prefs.js

[erinn@xxxxxxxxxxxxxx]

Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Sun, 24 Oct 2010 15:09:08 -0700
Subject: update Firefox to 3.6.11 and fix wanIpAsLocal option to prefs.js
Commit: 9e2a0c8e107c21c48535bc4086a9ee27478fcff9

---
 README.Linux                  |    5 ++++-
 build-scripts/Makefile.linux  |    6 +++---
 build-scripts/config/prefs.js |    1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.Linux b/README.Linux
index a415464..aec5373 100644
--- a/README.Linux
+++ b/README.Linux
@@ -7,7 +7,7 @@ Included applications
 Vidalia 0.2.10 (with Qt 4.6.2)
 Tor 0.2.2.17-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8l) 
 Polipo 1.0.4.1
-Firefox 3.6.10
+Firefox 3.6.11
  \_ Torbutton 1.2.5
  |_ NoScript 2.0.2.3
  |_ BetterPrivacy 1.48.3
@@ -30,6 +30,9 @@ To exit, close Firefox. Vidalia will automatically clean up and exit.
 Changelog
 ---------
 
+1.0.14: Released 2010-10-24
+        Update Firefox to 3.6.11
+
 1.0.13: Released 2010-10-01
         Update Tor to 0.2.2.17-alpha
         Update Firefox to 3.6.10
diff --git a/build-scripts/Makefile.linux b/build-scripts/Makefile.linux
index dfbe44f..ce87e77 100644
--- a/build-scripts/Makefile.linux
+++ b/build-scripts/Makefile.linux
@@ -35,14 +35,14 @@
 ARCH_TYPE=$(shell uname -m)
 
 ## Location of directory for source unpacking
-FETCH_DIR=/build
+FETCH_DIR=/home/e/build
 ## Location of directory for prefix/destdir/compiles/etc
 BUILT_DIR=$(FETCH_DIR)/built
 TBB_FINAL=$(BUILT_DIR)/TBBL
 
 ## Versions for our source packages
 HTTPSEVERY_VER=0.2.2
-FIREFOX_VER=3.6.10
+FIREFOX_VER=3.6.11
 LIBEVENT_VER=1.4.13-stable
 LIBPNG_VER=1.4.3
 NOSCRIPT_VER=2.0.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.0.13-dev
+VERSION=1.0.14-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)
diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js
index 25ab818..f921028 100644
--- a/build-scripts/config/prefs.js
+++ b/build-scripts/config/prefs.js
@@ -151,4 +151,5 @@ user_pref("noscript.showUntrusted", false);
 user_pref("noscript.subscription.lastCheck", -1723345640);
 user_pref("noscript.temp", "");
 user_pref("noscript.untrusted", "");
+user_pref("noscript.ABE.wanIpAsLocal", false);
 user_pref("noscript.version", "2.0.3.2");
-- 
1.7.1