[torbrowser/maint-2.3] bump all tbbs for tor 0.2.2.36 - tor-commits

28 May 2012

commit 894634d8ae6bce9ff9899a5ae15dcdc358c557e4
Author: Erinn Clark erinn@torproject.org
Date:   Mon May 28 15:53:25 2012 -0300
bump all tbbs for tor 0.2.2.36
---
 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/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, 40 insertions(+), 16 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index f379cce..98b6863 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -5,11 +5,11 @@ Included applications
 ---------------------
Vidalia 0.2.17 (with Qt 4.8.1)
-Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c)
+Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c)
 Firefox 12.0
  _ Torbutton 1.4.5.1
- |_ NoScript 2.4.1
- |_ HTTPS-Everywhere 2.0.2
+ |_ NoScript 2.4.3
+ |_ HTTPS-Everywhere 2.0.5
Usage
 -----
diff --git a/README.OSX-2.2 b/README.OSX-2.2
index ebe97b4..8609d47 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -5,11 +5,11 @@ Included applications
 ---------------------
Vidalia 0.2.17 (with Qt 4.8.1)
-Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c)
+Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c)
 Firefox 12.0
  _ Torbutton 1.4.5.1
- |_ NoScript 2.4.1
- |_ HTTPS-Everywhere 2.0.2
+ |_ NoScript 2.4.3
+ |_ HTTPS-Everywhere 2.0.5
Usage
 -----
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index a3bac24..cd5c811 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -5,11 +5,11 @@ Included applications
 ---------------------
Vidalia 0.2.17 (with Qt 4.8.1)
-Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c)
+Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c)
 Firefox 12.0
  _ Torbutton 1.4.5.1
- |_ NoScript 2.4.1
- |_ HTTPS-Everywhere 2.0.2
+ |_ NoScript 2.4.3
+ |_ HTTPS-Everywhere 2.0.5
Usage
 -----
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index d3a2697..ef72f13 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -15,7 +15,7 @@
## Architecture
 ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=12
+BUILD_NUM=1
 PLATFORM=Linux
## Build machine specific settings
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index bfc628d..40b3d01 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -15,7 +15,7 @@
## Architecture
 ARCH_TYPE=x86_64
-BUILD_NUM=12
+BUILD_NUM=1
 PLATFORM=MacOS
## Set OSX-specific backwards compatibility options
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index fdd3902..035875e 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -1,6 +1,6 @@
 #!/usr/bin/make
-RELEASE_VER=2.2.35
+RELEASE_VER=2.2.36
ZLIB_VER=1.2.7
 OPENSSL_VER=1.0.1c
@@ -8,14 +8,14 @@ LIBPNG_VER=1.5.10
 QT_VER=4.8.1
 VIDALIA_VER=0.2.17
 LIBEVENT_VER=2.0.19-stable
-TOR_VER=0.2.2.35
+TOR_VER=0.2.2.36
 PIDGIN_VER=2.6.4
 FIREFOX_VER=12.0
 MOZBUILD_VER=1.5.1
 PYMAKE_VER=87d436cd8974
 TORBUTTON_VER=1.4.5.1
-NOSCRIPT_VER=2.4.1
-HTTPSEVERYWHERE_VER=2.0.2
+NOSCRIPT_VER=2.4.3
+HTTPSEVERYWHERE_VER=2.0.5
 OTR_VER=3.2.0
 OBFSPROXY_VER=0.1.4
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index e2537c2..60a5b95 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -13,7 +13,7 @@
 ### Configuration ###
 #####################
-BUILD_NUM=13
+BUILD_NUM=1
 PLATFORM=Windows
## Location of required libraries
diff --git a/changelog.linux-2.2 b/changelog.linux-2.2
index db2edfa..7305e5e 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.36-1); suite=linux
+
+  * Update Tor to 0.2.2.36
+  * Update NoScript to 2.3.4
+  * Update HTTPS Everywhere to 2.0.5
+
+ -- Erinn Clark erinn@torproject.org  Mon May 28 15:50:12 BRT 2012
+
 Tor Browser Bundle (2.2.35-12); suite=linux
* Update OpenSSL to 1.0.1c
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index f432023..c1e6519 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.36-1); suite=osx
+
+  * Update Tor to 0.2.2.36
+  * Update NoScript to 2.3.4
+  * Update HTTPS Everywhere to 2.0.5
+
+ -- Erinn Clark erinn@torproject.org  Mon May 28 15:50:07 BRT 2012
+
 Tor Browser Bundle (2.2.35-12); suite=osx
* Update OpenSSL to 1.0.1c
diff --git a/changelog.windows-2.2 b/changelog.windows-2.2
index 3fd8a29..7d4c989 100644
--- a/changelog.windows-2.2
+++ b/changelog.windows-2.2
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.2.36-1); suite=windows
+
+  * Update Tor to 0.2.2.36
+  * Update NoScript to 2.3.4
+  * Update HTTPS Everywhere to 2.0.5
+
+ -- Erinn Clark erinn@torproject.org  Mon May 28 15:50:09 BRT 2012
+
 Tor Browser Bundle (2.2.35-13); suite=windows
* Fix Firefox build to sanitize file paths (closes: #5922)

    