[tor-commits] [torbrowser/master] bump all tbb versions to 2.2.35-8 for firefox 11, openssl 1.0.0h, noscript 2.3.4, and https-everywhere 2.0.1
erinn at torproject.org
erinn at torproject.org
Fri Mar 16 21:31:49 UTC 2012
commit bf9dd2ec0c77639f602748758b801b7de5458fc6
Author: Erinn Clark <erinn at torproject.org>
Date: Fri Mar 16 18:28:17 2012 -0300
bump all tbb versions to 2.2.35-8 for firefox 11, openssl 1.0.0h, noscript 2.3.4, and https-everywhere 2.0.1
---
README.LINUX-2.2 | 8 ++++----
README.OSX-2.2 | 8 ++++----
README.WIN-2.2 | 8 ++++----
build-scripts/linux.mk | 2 +-
build-scripts/osx.mk | 4 ++--
build-scripts/versions.mk | 6 +++---
build-scripts/windows.mk | 2 +-
changelog.linux-2.2 | 13 +++++++++++++
changelog.osx-2.2 | 12 ++++++++++++
changelog.windows-2.2 | 12 ++++++++++++
10 files changed, 56 insertions(+), 19 deletions(-)
diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index 9bcca0a..beef2e1 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -5,11 +5,11 @@ Included applications
---------------------
Vidalia 0.2.17 (with Qt 4.7.4)
-Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g)
-Firefox 10.0.2
+Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h)
+Firefox 11.0
\_ Torbutton 1.4.5.1
- |_ NoScript 2.3
- |_ HTTPS-Everywhere 1.2.2
+ |_ NoScript 2.3.4
+ |_ HTTPS-Everywhere 2.0.1
Usage
-----
diff --git a/README.OSX-2.2 b/README.OSX-2.2
index 5b97b50..01fdcf6 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -5,11 +5,11 @@ Included applications
---------------------
Vidalia 0.2.17 (with Qt 4.7.4)
-Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g)
-Firefox 10.0.2
+Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h)
+Firefox 11.0
\_ Torbutton 1.4.5.1
- |_ NoScript 2.3
- |_ HTTPS-Everywhere 1.2.2
+ |_ NoScript 2.3.4
+ |_ HTTPS-Everywhere 2.0.1
Usage
-----
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index d40fde9..d2516ac 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -5,11 +5,11 @@ Included applications
---------------------
Vidalia 0.2.17 (with Qt 4.7.4)
-Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g)
-Firefox 10.0.2
+Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h)
+Firefox 11.0
\_ Torbutton 1.4.5.1
- |_ NoScript 2.3
- |_ HTTPS-Everywhere 1.2.2
+ |_ NoScript 2.3.4
+ |_ HTTPS-Everywhere 2.0.1
Usage
-----
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 620a070..e2e2f4a 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -15,7 +15,7 @@
## Architecture
ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=7.2
+BUILD_NUM=8
PLATFORM=Linux
## Build machine specific settings
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 384ff44..b1415b3 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -14,8 +14,8 @@
## Architecture
-ARCH_TYPE=i386
-BUILD_NUM=7.1
+ARCH_TYPE=x86_64
+BUILD_NUM=8
PLATFORM=MacOS
## Set OSX-specific backwards compatibility options
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 6af2e51..395be17 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -3,7 +3,7 @@
RELEASE_VER=2.2.35
ZLIB_VER=1.2.6
-OPENSSL_VER=1.0.0g
+OPENSSL_VER=1.0.0h
LIBPNG_VER=1.5.9
QT_VER=4.7.4
VIDALIA_VER=0.2.17
@@ -14,8 +14,8 @@ FIREFOX_VER=11.0
MOZBUILD_VER=1.5.1
PYMAKE_VER=87d436cd8974
TORBUTTON_VER=1.4.5.1
-NOSCRIPT_VER=2.3
-HTTPSEVERYWHERE_VER=1.2.2
+NOSCRIPT_VER=2.3.4
+HTTPSEVERYWHERE_VER=2.0.1
OTR_VER=3.2.0
## Extension IDs
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 978c008..4192243 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -13,7 +13,7 @@
### Configuration ###
#####################
-BUILD_NUM=7.1
+BUILD_NUM=8
PLATFORM=Windows
## Location of required libraries
diff --git a/changelog.linux-2.2 b/changelog.linux-2.2
index 6a0e683..e0fa3f1 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,16 @@
+Tor Browser Bundle (2.2.35-8); suite=linux
+
+ * Update Firefox to 11.0
+ * Update OpenSSL to 1.0.0h
+ * Update NoScript to 2.3.4
+ * Update HTTPS Everywhere to 2.0.1
+ * Always build to with warnings enabled (closes; #4470)
+ * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300)
+ * Don't attempt to load the default KDE 4 theme from Vidalia, because that
+ fails when the Qt versions don't match (closes: #5214)
+
+ -- Erinn Clark <erinn at torproject.org> Fri Mar 16 18:05:13 BRT 2012
+
Tor Browser Bundle (2.2.35-7.2); suite=linux
* Really update Firefox to 10.0.2
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index 8a0fd24..ab5f160 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,3 +1,15 @@
+Tor Browser Bundle (2.2.35-8); suite=osx
+
+ * Update Firefox to 11.0
+ * Update OpenSSL to 1.0.0h
+ * Update NoScript to 2.3.4
+ * Update HTTPS Everywhere to 2.0.1
+ * Always build to with warnings enabled (closes; #4470)
+ * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300)
+ * Give OS X users below 10.5 an incompatibility message (closes: #4356)
+
+ -- Erinn Clark <erinn at torproject.org> Fri Mar 16 18:05:07 BRT 2012
+
Tor Browser Bundle (2.2.35-7.1); suite=osx
* Actually update Firefox to 10.0.2 in the 64-bit bundle
diff --git a/changelog.windows-2.2 b/changelog.windows-2.2
index 9566857..4f015fb 100644
--- a/changelog.windows-2.2
+++ b/changelog.windows-2.2
@@ -1,3 +1,15 @@
+Tor Browser Bundle (2.2.35-8); suite=windows
+
+ * Update Firefox to 11.0
+ * Update OpenSSL to 1.0.0h
+ * Update NoScript to 2.3.4
+ * Update HTTPS Everywhere to 2.0.1
+ * Always build to with warnings enabled (closes; #4470)
+ * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300)
+ * Remove tor-resolve from the Windows bundle (closes: #5403)
+
+ -- Erinn Clark <erinn at torproject.org> Fri Mar 16 18:05:10 BRT 2012
+
Tor Browser Bundle (2.2.35-7.1); suite=windows
* Actually update to Firefox 10.0.2
More information about the tor-commits
mailing list