[tor-commits] [torbrowser/master] bump tbbs to 2.2.35-4 for new openssl

[erinn at torproject.org]

commit b68db42c8ab2d69e59e646131d19f01f6359c1af
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Jan 5 11:04:14 2012 +0100

    bump tbbs to 2.2.35-4 for new openssl
---
 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/windows.mk |    2 +-
 changelog.linux-2.2      |    7 +++++++
 changelog.osx-2.2        |    7 +++++++
 changelog.windows-2.2    |    7 +++++++
 9 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index 87cb931..fa8278a 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -5,10 +5,10 @@ Included applications
 ---------------------
 
 Vidalia 0.2.15 (with Qt 4.6.2)
-Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e)
+Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0f)
 Firefox (Aurora) 9.0.1
  \_ Torbutton 1.4.5.1
- |_ NoScript 2.2.4
+ |_ NoScript 2.2.5
  |_ HTTPS-Everywhere 1.2.1
 
 Usage
diff --git a/README.OSX-2.2 b/README.OSX-2.2
index 2ea9db6..f5b4363 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -5,10 +5,10 @@ Included applications
 ---------------------
 
 Vidalia 0.2.15 (with Qt 4.6.2)
-Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0d)
+Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0f)
 Firefox (Aurora) 9.0.1
  \_ Torbutton 1.4.5.1
- |_ NoScript 2.2.4
+ |_ NoScript 2.2.5
  |_ HTTPS-Everywhere 1.2.1
 
 Usage
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index b005c2a..6fa63a6 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -5,11 +5,11 @@ Included applications
 ---------------------
 
 Vidalia 0.2.15 (with Qt 4.6.2)
-Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e)
+Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0f)
 FirefoxPortable 9.0.1
  \_ Firefox (Aurora) 9.0.1
     \_ Torbutton 1.4.5.1
-    |_ NoScript 2.2.4
+    |_ NoScript 2.2.5
     |_ HTTPS-Everywhere 1.2.1
 
 Usage
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 4f93eec..594e4d7 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -36,7 +36,7 @@ include $(PWD)/versions.mk
 
 ## Architecture
 ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=3
+BUILD_NUM=4
 PLATFORM=Linux
 
 ## Location of directory for source unpacking
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index f53941b..8f31ec8 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -36,7 +36,7 @@ include $(PWD)/versions.mk
 
 ## Architecture
 ARCH_TYPE=i386
-BUILD_NUM=3
+BUILD_NUM=4
 PLATFORM=MacOS
 
 ## Location of directory for source unpacking
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 8c2971f..5d2371b 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -31,7 +31,7 @@
 
 ## Include versions
 include $(PWD)/versions.mk
-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 9475ded..fb5e57c 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.2.35-4); suite=linux
+
+  * Update OpenSSL to 1.0.0f
+  * Update NoScript to 2.2.5
+
+ -- Erinn Clark <erinn at torproject.org>  Thu Jan  5 11:02:28 CET 2012
+
 Tor Browser Bundle (2.2.35-3); suite=linux
 
   * Update Firefox to 9.0.1
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index 4f850d0..a327aaf 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.2.35-4); suite=osx
+
+  * Update OpenSSL to 1.0.0f
+  * Update NoScript to 2.2.5
+
+ -- Erinn Clark <erinn at torproject.org>  Thu Jan  5 11:01:36 CET 2012
+
 Tor Browser Bundle (2.2.35-3); suite=osx
 
   * Update Firefox to 9.0.1
diff --git a/changelog.windows-2.2 b/changelog.windows-2.2
index c53d06d..36fd885 100644
--- a/changelog.windows-2.2
+++ b/changelog.windows-2.2
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.2.35-4); suite=windows
+
+  * Update OpenSSL to 1.0.0f
+  * Update NoScript to 2.2.5
+
+ -- Erinn Clark <erinn at torproject.org>  Thu Jan  5 11:02:26 CET 2012
+
 Tor Browser Bundle (2.2.35-3); suite=windows
 
   * Update Firefox to 9.0.1