[tor-commits] [torbrowser/maint-2.2] bump all tbb versions to 2.2.33-1, update changelogs and readmes
erinn at torproject.org
erinn at torproject.org
Thu Sep 29 15:14:43 UTC 2011
commit eb42c2f2ca4e144b036f082508635c5a2bda12ed
Author: Erinn Clark <erinn at torproject.org>
Date: Thu Sep 29 16:14:09 2011 +0100
bump all tbb versions to 2.2.33-1, update changelogs and readmes
---
README.LINUX-2.2 | 8 ++++----
README.OSX-2.2 | 8 ++++----
README.WIN-2.2 | 10 +++++-----
build-scripts/linux.mk | 2 +-
build-scripts/osx.mk | 2 +-
build-scripts/versions.mk | 8 ++++----
build-scripts/windows.mk | 2 +-
changelog.linux-2.2 | 11 +++++++++++
changelog.osx-2.2 | 12 ++++++++++++
changelog.windows-2.2 | 12 ++++++++++++
10 files changed, 55 insertions(+), 20 deletions(-)
diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index 2f23ecf..5448f89 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -5,11 +5,11 @@ Included applications
---------------------
Vidalia 0.2.14 (with Qt 4.6.2)
-Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d)
-Firefox (Aurora) 6.0.2
+Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e)
+Firefox (Aurora) 7.0
\_ Torbutton 1.4.3
- |_ NoScript 2.1.2.7
- |_ HTTPS-Everywhere 1.0.0development.5
+ |_ NoScript 2.1.2.8
+ |_ HTTPS-Everywhere 1.0.3
Usage
-----
diff --git a/README.OSX-2.2 b/README.OSX-2.2
index 0f63125..fd6ae31 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -5,11 +5,11 @@ Included applications
---------------------
Vidalia 0.2.14 (with Qt 4.6.2)
-Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d)
-Firefox (Aurora) 6.0.2
+Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d)
+Firefox (Aurora) 7.0
\_ Torbutton 1.4.3
- |_ NoScript 2.1.2.7
- |_ HTTPS-Everywhere 1.0.0development.5
+ |_ NoScript 2.1.2.8
+ |_ HTTPS-Everywhere 1.0.3
Usage
-----
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index 90f8fc7..bd27aa1 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -5,12 +5,12 @@ Included applications
---------------------
Vidalia 0.2.14 (with Qt 4.6.2)
-Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d)
-FirefoxPortable 6.0.2
- \_ Firefox (Aurora) 6.0.2
+Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e)
+FirefoxPortable 7.0
+ \_ Firefox (Aurora) 7.0
\_ Torbutton 1.4.3
- |_ NoScript 2.1.2.7
- |_ HTTPS-Everywhere 1.0.0development.5
+ |_ NoScript 2.1.2.8
+ |_ HTTPS-Everywhere 1.0.3
Usage
-----
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 3d6c6bf..c37447d 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=4
+BUILD_NUM=1
PLATFORM=Linux
## Location of directory for source unpacking
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index d19576e..1ea955b 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=4
+BUILD_NUM=1
PLATFORM=MacOS
## Location of directory for source unpacking
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index c44c3b5..af6335e 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -1,20 +1,20 @@
#!/usr/bin/make
-RELEASE_VER=2.2.32
+RELEASE_VER=2.2.33
HTTPSEVERY_VER=1.0.3
FIREFOX_VER=7.0
LIBEVENT_VER=2.0.14-stable
LIBPNG_VER=1.4.8
-NOSCRIPT_VER=2.1.2.7
-OPENSSL_VER=1.0.0d
+NOSCRIPT_VER=2.1.2.8
+OPENSSL_VER=1.0.0e
OTR_VER=3.2.0
PIDGIN_VER=2.6.4
QT_VER=4.6.2
TOR_VER=0.2.2.33
TORBUTTON_VER=1.4.3
VIDALIA_VER=0.2.14
-ZLIB_VER=1.4.0
+ZLIB_VER=1.2.5
## Extension IDs
FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 741887c..d62aeff 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -31,7 +31,7 @@
## Include versions
include $(PWD)/versions.mk
-BUILD_NUM=4
+BUILD_NUM=1
PLATFORM=Windows
## Location of required libraries
diff --git a/changelog.linux-2.2 b/changelog.linux-2.2
index 15edc9c..df90085 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,14 @@
+Tor Browser Bundle (2.2.33-1); suite=linux
+
+ * Update Firefox to 7
+ * Update OpenSSL to 1.0.0e (closes: #3996)
+ * Update Tor to 0.2.2.33
+ * Update NoScript to 2.1.2.8
+ * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to
+ use development versions of extensions (closes: #4050)
+
+ -- Erinn Clark <erinn at torproject.org> Thu Sep 29 15:52:32 BST 2011
+
Tor Browser Bundle (2.2.32-4); suite=linux
* Fix Makefile to allow for automatic retrieval of Qt and libpng (closes: #2255)
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index 72c0058..75eb8d8 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,3 +1,15 @@
+Tor Browser Bundle (2.2.33-1); suite=osx
+
+ * Update Firefox to 7
+ * Update Tor to 0.2.2.33
+ * Update NoScript to 2.1.2.8
+ * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to
+ use development versions of extensions (closes: #4050)
+ * Stop TBB from logging so much information to the system by only allowing
+ dyld log library loads to syslog when it is in debug mode (closes: #4093)
+
+ -- Erinn Clark <erinn at torproject.org> Thu Sep 29 15:44:48 BST 2011
+
Tor Browser Bundle (2.2.32-4); suite=osx
* New Firefox patches
diff --git a/changelog.windows-2.2 b/changelog.windows-2.2
index b09bbf3..510cac2 100644
--- a/changelog.windows-2.2
+++ b/changelog.windows-2.2
@@ -1,3 +1,15 @@
+Tor Browser Bundle (2.2.33-1); suite=windows
+
+ * Update Firefox to 7
+ * Update OpenSSL to 1.0.0e (closes: #3996)
+ * Update Tor to 0.2.2.33
+ * Update NoScript to 2.1.2.8
+ * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to
+ use development versions of extensions (closes: #4050)
+ * Begin building Vidalia with DEP/ASLR
+
+ -- Erinn Clark <erinn at torproject.org> Thu Sep 29 15:51:02 BST 2011
+
Tor Browser Bundle (2.2.32-4); suite=windows
* Disable automatic port selection to accommodate Windows users with
More information about the tor-commits
mailing list