[torbrowser/maint-2.2] update all stable TBBs to 2.2.39-1 for Tor 0.2.2.39 - tor-commits

11 Sep 2012

commit 3106539e60690a7ec50a6132f328e1dab623e309
Author: Erinn Clark erinn@torproject.org
Date:   Tue Sep 11 19:11:44 2012 +0100
update all stable TBBs to 2.2.39-1 for Tor 0.2.2.39
---
 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 |    6 +++---
 build-scripts/windows.mk  |    2 +-
 changelog.linux-2.2       |    7 +++++++
 changelog.osx-2.2         |    7 +++++++
 changelog.windows-2.2     |    7 +++++++
 10 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index 2ee157d..cd4e9b6 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -5,10 +5,10 @@ Included applications
 ---------------------
Vidalia 0.2.20 (with Qt 4.8.1)
-Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
+Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
 Firefox 10.0.7esr
  _ Torbutton 1.4.6
- |_ NoScript 2.5.2
+ |_ NoScript 2.5.4
  |_ HTTPS-Everywhere 2.2.1
Usage
diff --git a/README.OSX-2.2 b/README.OSX-2.2
index dc6d794..b317861 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -5,10 +5,10 @@ Included applications
 ---------------------
Vidalia 0.2.20 (with Qt 4.8.1)
-Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
+Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
 Firefox 10.0.7esr
  _ Torbutton 1.4.6
- |_ NoScript 2.5.2
+ |_ NoScript 2.5.4
  |_ HTTPS-Everywhere 2.2.1
Usage
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index 6e8ae48..bf3ee84 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -5,10 +5,10 @@ Included applications
 ---------------------
Vidalia 0.2.20 (with Qt 4.8.1)
-Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
+Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
 Firefox 10.0.7esr
  _ Torbutton 1.4.6
- |_ NoScript 2.5.2
+ |_ NoScript 2.5.4
  |_ HTTPS-Everywhere 2.2.1
Usage
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 7e9a20f..137591b 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -15,7 +15,7 @@
## Architecture
 ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=2
+BUILD_NUM=1
 PLATFORM=Linux
## Build machine specific settings
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index f08b50c..6ceb3e7 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -15,7 +15,7 @@
## Architecture
 ARCH_TYPE=x86_64
-BUILD_NUM=2
+BUILD_NUM=1
 PLATFORM=MacOS
## Set OSX-specific backwards compatibility options
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index a082236..4640acc 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -1,6 +1,6 @@
 #!/usr/bin/make
-RELEASE_VER=2.2.38
+RELEASE_VER=2.2.39
ZLIB_VER=1.2.7
 OPENSSL_VER=1.0.1c
@@ -8,13 +8,13 @@ LIBPNG_VER=1.5.12
 QT_VER=4.8.1
 VIDALIA_VER=0.2.20
 LIBEVENT_VER=2.0.20-stable
-TOR_VER=0.2.2.38
+TOR_VER=0.2.2.39
 PIDGIN_VER=2.6.4
 FIREFOX_VER=10.0.7esr
 MOZBUILD_VER=1.5.1
 PYMAKE_VER=87d436cd8974
 TORBUTTON_VER=1.4.6
-NOSCRIPT_VER=2.5.2
+NOSCRIPT_VER=2.5.4
 HTTPSEVERYWHERE_VER=2.2.1
 OTR_VER=3.2.0
 OBFSPROXY_VER=0.1.4
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index a871270..0492f84 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -13,7 +13,7 @@
 ### Configuration ###
 #####################
-BUILD_NUM=2
+BUILD_NUM=1
 PLATFORM=Windows
## Location of required libraries
diff --git a/changelog.linux-2.2 b/changelog.linux-2.2
index c4b6d52..aee61e2 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.2.39-1); suite=linux
+
+  * Update Tor to 0.2.2.39
+  * Update NoScript to 2.5.4
+
+ -- Erinn Clark erinn@torproject.org  Tue Sep 11 19:09:39 BST 2012
+
 Tor Browser Bundle (2.2.38-2); suite=linux
* Update Firefox to 10.0.7esr
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index d3b0776..a778ee7 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.2.39-1); suite=osx
+
+  * Update Tor to 0.2.2.39
+  * Update NoScript to 2.5.4
+
+ -- Erinn Clark erinn@torproject.org  Tue Sep 11 19:09:34 BST 2012
+
 Tor Browser Bundle (2.2.38-2); suite=osx
* Update Firefox to 10.0.7esr
diff --git a/changelog.windows-2.2 b/changelog.windows-2.2
index a604b2c..b431172 100644
--- a/changelog.windows-2.2
+++ b/changelog.windows-2.2
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.2.39-1); suite=windows
+
+  * Update Tor to 0.2.2.39
+  * Update NoScript to 2.5.4
+
+ -- Erinn Clark erinn@torproject.org  Tue Sep 11 19:09:36 BST 2012
+
 Tor Browser Bundle (2.2.38-2); suite=windows
* Update Firefox to 10.0.7esr

    