[tor-commits] [torbrowser/master] bump all stable TBBs to 2.2.39-6

[erinn at torproject.org]

commit 2b4266a1642070656fad35629e8e707a59558b26
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Nov 20 14:21:44 2012 +0000

    bump all stable TBBs to 2.2.39-6
---
 README.LINUX-2.2         |    6 +++---
 README.OSX-2.2           |    6 +++---
 README.WIN-2.2           |    6 +++---
 build-scripts/linux.mk   |    2 +-
 build-scripts/osx.mk     |    2 +-
 build-scripts/windows.mk |    2 +-
 changelog.linux-2.2      |    8 ++++++++
 changelog.osx-2.2        |    8 ++++++++
 changelog.windows-2.2    |    8 ++++++++
 9 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index c02223d..52a9ef3 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -6,10 +6,10 @@ Included applications
 
 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.10esr
+Firefox 10.0.11esr
  \_ Torbutton 1.4.6.3
- |_ NoScript 2.5.9
- |_ HTTPS-Everywhere 3.0.2
+ |_ NoScript 2.6.1
+ |_ HTTPS-Everywhere 3.0.4
 
 Usage
 -----
diff --git a/README.OSX-2.2 b/README.OSX-2.2
index d62db2b..a1bf21b 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -6,10 +6,10 @@ Included applications
 
 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.10esr
+Firefox 10.0.11esr
  \_ Torbutton 1.4.6.3
- |_ NoScript 2.5.9
- |_ HTTPS-Everywhere 3.0.2
+ |_ NoScript 2.6.1
+ |_ HTTPS-Everywhere 3.0.4
 
 Usage
 -----
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index ab0369f..b6731f5 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -6,10 +6,10 @@ Included applications
 
 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.10esr
+Firefox 10.0.11esr
  \_ Torbutton 1.4.6.3
- |_ NoScript 2.5.9
- |_ HTTPS-Everywhere 3.0.2
+ |_ NoScript 2.6.1
+ |_ HTTPS-Everywhere 3.0.4
 
 Usage
 -----
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 40c0a03..db1e3b0 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -15,7 +15,7 @@
 
 ## Architecture
 ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=5
+BUILD_NUM=6
 PLATFORM=Linux
 
 ## Build machine specific settings
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 4cab2df..4146f96 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -15,7 +15,7 @@
 
 ## Architecture
 ARCH_TYPE=x86_64
-BUILD_NUM=5
+BUILD_NUM=6
 PLATFORM=MacOS
 
 ## Set OSX-specific backwards compatibility options
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 1ea710e..e21be14 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -13,7 +13,7 @@
 ### Configuration ###
 #####################
 
-BUILD_NUM=5
+BUILD_NUM=6
 PLATFORM=Windows
 
 ## Location of required libraries
diff --git a/changelog.linux-2.2 b/changelog.linux-2.2
index 13795e5..f8f5e19 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.39-6); suite=linux
+
+  * Update Firefox 10.0.11esr
+  * Update NoScript to 2.6.1
+  * Update HTTPS Everywhere to 3.0.4
+
+ -- Erinn Clark <erinn at torproject.org>  Tue Nov 20 14:19:38 GMT 2012
+
 Tor Browser Bundle (2.2.39-5); suite=linux
 
   * Update Firefox to 10.0.10esr
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index 8bc305b..f3d84da 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.39-6); suite=osx
+
+  * Update Firefox 10.0.11esr
+  * Update NoScript to 2.6.1
+  * Update HTTPS Everywhere to 3.0.4
+
+ -- Erinn Clark <erinn at torproject.org>  Tue Nov 20 14:19:32 GMT 2012
+
 Tor Browser Bundle (2.2.39-5); suite=osx
 
   * Update Firefox to 10.0.10esr
diff --git a/changelog.windows-2.2 b/changelog.windows-2.2
index 2fa96df..7c0dd35 100644
--- a/changelog.windows-2.2
+++ b/changelog.windows-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.39-6); suite=windows
+
+  * Update Firefox 10.0.11esr
+  * Update NoScript to 2.6.1
+  * Update HTTPS Everywhere to 3.0.4
+
+ -- Erinn Clark <erinn at torproject.org>  Tue Nov 20 14:19:34 GMT 2012
+
 Tor Browser Bundle (2.2.39-5); suite=windows
 
   * Update Firefox to 10.0.10esr