[tor-commits] [torbrowser/master] bump all tbbs to 2.2.35-1 for new tor release
erinn at torproject.org
erinn at torproject.org
Fri Dec 16 17:00:39 UTC 2011
commit 8abea369ae8593fd32ea590e36b76eee52ab1c99
Author: Erinn Clark <erinn at torproject.org>
Date: Fri Dec 16 05:53:03 2011 +0000
bump all tbbs to 2.2.35-1 for new tor release
---
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/recommended-versions | 15 +++++----------
build-scripts/versions.mk | 8 ++++----
build-scripts/windows.mk | 2 +-
changelog.linux-2.2 | 11 +++++++++++
changelog.osx-2.2 | 11 +++++++++++
changelog.windows-2.2 | 11 +++++++++++
11 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index 8be6ca9..308a7a3 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.34 (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.0e)
Firefox (Aurora) 8.0.1
- \_ Torbutton 1.4.4.1
- |_ NoScript 2.2
+ \_ Torbutton 1.4.5
+ |_ NoScript 2.2.3
|_ HTTPS-Everywhere 1.2.1
Usage
diff --git a/README.OSX-2.2 b/README.OSX-2.2
index e5a67ad..5d37e23 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.34 (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.0d)
Firefox (Aurora) 8.0.1
- \_ Torbutton 1.4.4.1
- |_ NoScript 2.2
+ \_ Torbutton 1.4.5
+ |_ NoScript 2.2.3
|_ HTTPS-Everywhere 1.2.1
Usage
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index 4329309..d874e72 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.34 (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.0e)
FirefoxPortable 8.0.1
\_ Firefox (Aurora) 8.0.1
- \_ Torbutton 1.4.4.1
- |_ NoScript 2.2
+ \_ Torbutton 1.4.5
+ |_ NoScript 2.2.3
|_ HTTPS-Everywhere 1.2.1
Usage
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 963da78..a8f9862 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=1
PLATFORM=Linux
## Location of directory for source unpacking
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index f53941b..817f32a 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=1
PLATFORM=MacOS
## Location of directory for source unpacking
diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions
index 2cb0cda..ae01274 100644
--- a/build-scripts/recommended-versions
+++ b/build-scripts/recommended-versions
@@ -1,12 +1,7 @@
[
-"2.2.34-2-Linux-i686",
-"2.2.34-2-Linux-x86_64",
-"2.2.34-2-MacOS-i386",
-"2.2.34-2-MacOS-x86_64",
-"2.2.34-2-Windows",
-"2.2.34-3-Linux-i686",
-"2.2.34-3-Linux-x86_64",
-"2.2.34-3-MacOS-i386",
-"2.2.34-3-MacOS-x86_64",
-"2.2.34-3-Windows"
+"2.2.35-1-Linux-i686",
+"2.2.35-1-Linux-x86_64",
+"2.2.35-1-MacOS-i386",
+"2.2.35-1-MacOS-x86_64",
+"2.2.35-1-Windows"
]
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 81c5f1c..c2b6ca7 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -1,18 +1,18 @@
#!/usr/bin/make
-RELEASE_VER=2.2.34
+RELEASE_VER=2.2.35
HTTPSEVERY_VER=1.2.1
FIREFOX_VER=8.0.1
LIBEVENT_VER=2.0.16-stable
LIBPNG_VER=1.4.8
-NOSCRIPT_VER=2.2
+NOSCRIPT_VER=2.2.3
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.34
-TORBUTTON_VER=1.4.4.1
+TOR_VER=0.2.2.35
+TORBUTTON_VER=1.4.5
VIDALIA_VER=0.2.15
ZLIB_VER=1.2.5
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 8f21e98..55447cc 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=1
PLATFORM=Windows
## Location of required libraries
diff --git a/changelog.linux-2.2 b/changelog.linux-2.2
index 7dd0125..429c50f 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,14 @@
+Tor Browser Bundle (2.2.35-1); suite=linux
+
+ * Update Tor to 0.2.2.35
+ * Update NoScript to 2.2.3
+ * Update Torbutton to 1.4.5
+ * New Firefox patches
+ - Disable SSL Session ID tracking
+ - Provide an observer event to close persistent connections
+
+ -- Erinn Clark <erinn at torproject.org> Fri Dec 16 03:56:12 GMT 2011
+
Tor Browser Bundle (2.2.34-3); suite=linux
* Update Firefox to 8.0.1
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index 6a4d198..6c88cc0 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,3 +1,14 @@
+Tor Browser Bundle (2.2.35-1); suite=osx
+
+ * Update Tor to 0.2.2.35
+ * Update NoScript to 2.2.3
+ * Update Torbutton to 1.4.5
+ * New Firefox patches
+ - Disable SSL Session ID tracking
+ - Provide an observer event to close persistent connections
+
+ -- Erinn Clark <erinn at torproject.org> Fri Dec 16 03:56:02 GMT 2011
+
Tor Browser Bundle (2.2.34-3); suite=osx
* Update Firefox to 8.0.1
diff --git a/changelog.windows-2.2 b/changelog.windows-2.2
index 1bb726c..bf0ba98 100644
--- a/changelog.windows-2.2
+++ b/changelog.windows-2.2
@@ -1,3 +1,14 @@
+Tor Browser Bundle (2.2.35-1); suite=windows
+
+ * Update Tor to 0.2.2.35
+ * Update NoScript to 2.2.3
+ * Update Torbutton to 1.4.5
+ * New Firefox patches
+ - Disable SSL Session ID tracking
+ - Provide an observer event to close persistent connections
+
+ -- Erinn Clark <erinn at torproject.org> Fri Dec 16 03:56:07 GMT 2011
+
Tor Browser Bundle (2.2.34-3); suite=windows
* Update Firefox to 8.0.1
More information about the tor-commits
mailing list