[or-cvs] [torbrowser/master] bump windows version

[erinn at torproject.org]

Author: Erinn Clark <erinn at torproject.org>
Date: Mon, 13 Dec 2010 16:48:53 -0800
Subject: bump windows version
Commit: cc174ed0cb83665458661595a115ca3162b11be1

---
 README                 |   14 +++++++++++---
 build-scripts/Makefile |   16 ++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/README b/README
index 28a2891..c52826c 100644
--- a/README
+++ b/README
@@ -7,10 +7,10 @@ Included applications
 Vidalia 0.2.10 (with Qt 4.6.2)
 Tor 0.2.1.27 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
 Polipo 1.0.4.1
-FirefoxPortable 3.6.12
- \_ Firefox 3.6.12
+FirefoxPortable 3.6.13
+ \_ Firefox 3.6.13
     \_ Torbutton 1.2.5
-    \_ HTTPS Everywhere 0.2.2
+    \_ HTTPS Everywhere 0.9.9.development.1
 PidginPortable 2.7.4
  \_ Pidgin 2.7.5
    \_ OTR 3.2
@@ -302,3 +302,11 @@ Changelog
     plugins and extensions (closes: #2118)
   remove NoScript and BetterPrivacy from stable bundle until they receive more
     testing
+
+1.3.14: Released 2010-12-13
+  update Firefox to 3.6.13
+  update HTTPS-Everywhere to 0.9.9.development.1
+    This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which 
+    prevented globally installed versions of the extensions from working. It also 
+    includes better protection from Firesheep. See the changelog here:
+    https://www.eff.org/files/Changelog.txt
diff --git a/build-scripts/Makefile b/build-scripts/Makefile
index ddc434c..03fad8d 100644
--- a/build-scripts/Makefile
+++ b/build-scripts/Makefile
@@ -14,19 +14,19 @@
 ## Location of required libraries
 MING=/c/c/mingw/bin
 QT=/c/Qt/4.6.2/bin
-OPENSSL=/c/build/openssl-0.9.8p/
+OPENSSL=/e/build/openssl-0.9.8p/
 
 ## Versions
 TORBUTTON_VERSION=1.2.5
-FIREFOX_VERSION=3.6.12
+FIREFOX_VERSION=3.6.13
 PIDGIN_VERSION=2.7.5
 
 ## Location of bundle components
-VIDALIA=/c/build/vidalia-0.2.10
-TOR=/c/build/tor-0.2.1.27
-POLIPO=/c/build/polipo-1.0.4.1
-FIREFOX_SRC=/c/build/FirefoxPortable-3.6.12
-PIDGIN_SRC=/c/build/PidginPortable-2.7.5
+VIDALIA=/e/build/vidalia-0.2.10
+TOR=/e/build/tor-0.2.1.27
+POLIPO=/e/build/polipo-1.0.4.1
+FIREFOX_SRC=/e/build/FirefoxPortable-3.6.13
+PIDGIN_SRC=/e/build/PidginPortable-2.7.5
 
 ## Location of utility applications
 PWD:=$(shell pwd)
@@ -49,7 +49,7 @@ DEST="Generic Bundle"
 NAME="Tor Browser"
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.3.13
+VERSION=1.3.14
 DEFAULT_COMPRESSED_BASENAME=tor-browser-
 IM_COMPRESSED_BASENAME=tor-im-browser-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
-- 
1.7.1