[torbrowser/master] bump stable tbbs to 2.2.39-4 for updated non-crashy firefox - tor-commits

18 Oct 2012

commit 279edcd26f0327e98cea5278a16c99c62dbe4885
Author: Erinn Clark erinn@torproject.org
Date:   Thu Oct 18 08:42:07 2012 +0100
bump stable tbbs to 2.2.39-4 for updated non-crashy firefox
---
 README.LINUX-2.2          |    4 ++--
 README.OSX-2.2            |    4 ++--
 README.WIN-2.2            |    4 ++--
 build-scripts/linux.mk    |    2 +-
 build-scripts/osx.mk      |    2 +-
 build-scripts/versions.mk |    4 ++--
 build-scripts/windows.mk  |    2 +-
 changelog.linux-2.2       |    8 ++++++++
 changelog.osx-2.2         |    8 ++++++++
 changelog.windows-2.2     |    8 ++++++++
 10 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index 859c854..fe79874 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1)
 Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
 Firefox 10.0.9esr
  _ Torbutton 1.4.6.3
- |_ NoScript 2.5.7
- |_ HTTPS-Everywhere 2.2.2
+ |_ NoScript 2.5.8
+ |_ HTTPS-Everywhere 3.0.2
Usage
 -----
diff --git a/README.OSX-2.2 b/README.OSX-2.2
index 3ffefa3..9250ce2 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1)
 Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
 Firefox 10.0.9esr
  _ Torbutton 1.4.6.3
- |_ NoScript 2.5.7
- |_ HTTPS-Everywhere 2.2.2
+ |_ NoScript 2.5.8
+ |_ HTTPS-Everywhere 3.0.2
Usage
 -----
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index 3c73b5c..bbbd27f 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -8,8 +8,8 @@ Vidalia 0.2.20 (with Qt 4.8.1)
 Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
 Firefox 10.0.9esr
  _ Torbutton 1.4.6.3
- |_ NoScript 2.5.7
- |_ HTTPS-Everywhere 2.2.2
+ |_ NoScript 2.5.8
+ |_ HTTPS-Everywhere 3.0.2
Usage
 -----
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 5e64cba..1d7feda 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -15,7 +15,7 @@
## Architecture
 ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=3
+BUILD_NUM=4
 PLATFORM=Linux
## Build machine specific settings
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 6325e5f..dd6154a 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -15,7 +15,7 @@
## Architecture
 ARCH_TYPE=x86_64
-BUILD_NUM=3
+BUILD_NUM=4
 PLATFORM=MacOS
## Set OSX-specific backwards compatibility options
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 6063f66..3da6032 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -14,8 +14,8 @@ FIREFOX_VER=10.0.9esr
 MOZBUILD_VER=1.5.1
 PYMAKE_VER=87d436cd8974
 TORBUTTON_VER=1.4.6.3
-NOSCRIPT_VER=2.5.7
-HTTPSEVERYWHERE_VER=2.2.2
+NOSCRIPT_VER=2.5.8
+HTTPSEVERYWHERE_VER=3.0.2
 OTR_VER=3.2.0
 OBFSPROXY_VER=0.1.4
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 54b972c..cbf4451 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -13,7 +13,7 @@
 ### Configuration ###
 #####################
-BUILD_NUM=3
+BUILD_NUM=4
 PLATFORM=Windows
## Location of required libraries
diff --git a/changelog.linux-2.2 b/changelog.linux-2.2
index 386cab3..10adc35 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.39-4); suite=linux
+
+  * Update Firefox patches to prevent crashing (closes: #7128)
+  * Update HTTPS Everywhere to 3.0.2
+  * Update NoScript to 2.5.8
+
+ -- Erinn Clark erinn@torproject.org  Thu Oct 18 08:40:15 BST 2012
+
 Tor Browser Bundle (2.2.39-3); suite=linux
* Update Firefox to 10.0.9esr
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index af3069a..a0cb5d0 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.39-4); suite=osx
+
+  * Update Firefox patches to prevent crashing (closes: #7128)
+  * Update HTTPS Everywhere to 3.0.2
+  * Update NoScript to 2.5.8
+
+ -- Erinn Clark erinn@torproject.org  Thu Oct 18 08:40:10 BST 2012
+
 Tor Browser Bundle (2.2.39-3); suite=osx
* Update Firefox to 10.0.9esr
diff --git a/changelog.windows-2.2 b/changelog.windows-2.2
index 094b8d2..d3006b0 100644
--- a/changelog.windows-2.2
+++ b/changelog.windows-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.39-4); suite=windows
+
+  * Update Firefox patches to prevent crashing (closes: #7128)
+  * Update HTTPS Everywhere to 3.0.2
+  * Update NoScript to 2.5.8
+
+ -- Erinn Clark erinn@torproject.org  Thu Oct 18 08:40:12 BST 2012
+
 Tor Browser Bundle (2.2.39-3); suite=windows
* Update Firefox to 10.0.9esr

    