[torbrowser/maint-2.2] bump all tbb versions to 2.2.34-1 and tor to 0.2.2.34 - tor-commits

27 Oct 2011

commit 78a0bcf0e521e638f0f190f5c4f56a8cb9afd549
Author: Erinn Clark erinn@torproject.org
Date:   Fri Oct 28 00:00:24 2011 +0100
bump all tbb versions to 2.2.34-1 and tor to 0.2.2.34
---
 README.LINUX-2.2          |    8 ++++----
 README.OSX-2.2            |    8 ++++----
 README.WIN-2.2            |    6 +++---
 build-scripts/linux.mk    |    2 +-
 build-scripts/osx.mk      |    2 +-
 build-scripts/versions.mk |    8 ++++----
 build-scripts/windows.mk  |    2 +-
 changelog.linux-2.2       |    8 ++++++++
 changelog.osx-2.2         |    8 ++++++++
 changelog.windows-2.2     |    8 ++++++++
 10 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index c6de227..5149411 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -5,11 +5,11 @@ Included applications
 ---------------------
Vidalia 0.2.15 (with Qt 4.6.2)
-Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e)
+Tor 0.2.2.34 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e)
 Firefox (Aurora) 7.0.1
- _ Torbutton 1.4.4
- |_ NoScript 2.1.4
- |_ HTTPS-Everywhere 1.0.3
+ _ Torbutton 1.4.4.1
+ |_ NoScript 2.1.7
+ |_ HTTPS-Everywhere 1.1
Usage
 -----
diff --git a/README.OSX-2.2 b/README.OSX-2.2
index 1fa2a62..1e56be0 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -5,11 +5,11 @@ Included applications
 ---------------------
Vidalia 0.2.15 (with Qt 4.6.2)
-Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d)
+Tor 0.2.2.34 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d)
 Firefox (Aurora) 7.0.1
- _ Torbutton 1.4.4
- |_ NoScript 2.1.4
- |_ HTTPS-Everywhere 1.0.3
+ _ Torbutton 1.4.4.1
+ |_ NoScript 2.1.7
+ |_ HTTPS-Everywhere 1.1
Usage
 -----
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index 0bc485b..67e73a1 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -5,12 +5,12 @@ Included applications
 ---------------------
Vidalia 0.2.15 (with Qt 4.6.2)
-Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e)
+Tor 0.2.2.34 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e)
 FirefoxPortable 7.0.1
  _ Firefox (Aurora) 7.0.1
     _ Torbutton 1.4.4.1
-    |_ NoScript 2.1.4
-    |_ HTTPS-Everywhere 1.0.3
+    |_ NoScript 2.1.7
+    |_ HTTPS-Everywhere 1.1
Usage
 -----
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 76949f5..73d0298 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 d131e85..a8a1841 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/versions.mk b/build-scripts/versions.mk
index 9582dc0..ba20232 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -1,17 +1,17 @@
 #!/usr/bin/make
-RELEASE_VER=2.2.33
+RELEASE_VER=2.2.34
-HTTPSEVERY_VER=1.0.3
+HTTPSEVERY_VER=1.1
 FIREFOX_VER=7.0.1
 LIBEVENT_VER=2.0.14-stable
 LIBPNG_VER=1.4.8
-NOSCRIPT_VER=2.1.4
+NOSCRIPT_VER=2.1.7
 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
+TOR_VER=0.2.2.34
 TORBUTTON_VER=1.4.4.1
 VIDALIA_VER=0.2.15
 ZLIB_VER=1.2.5
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index f37a748..380596e 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 a6add26..36df2d8 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.34-1); suite=linux
+
+  * Update Tor to 0.2.2.34
+  * Update NoScript 2.1.7
+  * Update HTTPS Everywhere to 1.1
+
+ -- Erinn Clark erinn@torproject.org  Thu Oct 27 02:33:56 BST 2011
+
 Tor Browser Bundle (2.2.33-3); suite=linux
* Update Vidalia to 0.2.15
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index e9b6daa..d4186fb 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.34-1); suite=osx
+
+  * Update Tor to 0.2.2.34
+  * Update NoScript 2.1.7
+  * Update HTTPS Everywhere to 1.1
+
+ -- Erinn Clark erinn@torproject.org  Thu Oct 27 02:24:06 BST 2011
+
 Tor Browser Bundle (2.2.33-3); suite=osx
* Update Vidalia to 0.2.15
diff --git a/changelog.windows-2.2 b/changelog.windows-2.2
index d4a0bc8..5c20651 100644
--- a/changelog.windows-2.2
+++ b/changelog.windows-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.34-1); suite=windows
+
+  * Update Tor to 0.2.2.34
+  * Update NoScript 2.1.7
+  * Update HTTPS Everywhere to 1.1
+
+ -- Erinn Clark erinn@torproject.org  Thu Oct 27 02:33:41 BST 2011
+
 Tor Browser Bundle (2.2.33-3); suite=windows
* Update Vidalia to 0.2.15

    