[torbrowser/maint-2.4] update alpha bundles to 2.4.14-alpha-1 - tor-commits

20 Jun 2013

commit 5c4983d17b682ce84865c489c91de1c1c2523964
Author: Erinn Clark erinn@torproject.org
Date:   Wed Jun 19 21:05:09 2013 -0300
update alpha bundles to 2.4.14-alpha-1
---
 README.LINUX-2.4                |    6 +++---
 README.OSX-2.4                  |    6 +++---
 README.WIN-2.4                  |    6 +++---
 build-scripts/linux-alpha.mk    |    2 +-
 build-scripts/osx-alpha.mk      |    2 +-
 build-scripts/versions-alpha.mk |   12 ++++++------
 build-scripts/windows-alpha.mk  |    2 +-
 changelog.linux-2.4             |   10 ++++++++++
 changelog.osx-2.4               |   10 ++++++++++
 changelog.windows-2.4           |   10 ++++++++++
 10 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/README.LINUX-2.4 b/README.LINUX-2.4
index 0aab8e1..a59b600 100644
--- a/README.LINUX-2.4
+++ b/README.LINUX-2.4
@@ -5,11 +5,11 @@ Included applications
 ---------------------
Vidalia 0.2.21 (with Qt 4.8.1)
-Tor 0.2.4.12-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k)
+Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
 Firefox 17.0.6esr
  _ Torbutton 1.5.2
- |_ NoScript 2.6.6.1
- |_ HTTPS-Everywhere 4.0development.6
+ |_ NoScript 2.6.6.2
+ |_ HTTPS-Everywhere 4.0development.8
  |_ PDF Viewer 0.8.1
Usage
diff --git a/README.OSX-2.4 b/README.OSX-2.4
index 942df88..923cb72 100644
--- a/README.OSX-2.4
+++ b/README.OSX-2.4
@@ -5,11 +5,11 @@ Included applications
 ---------------------
Vidalia 0.2.21 (with Qt 4.8.1)
-Tor 0.2.4.12-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k)
+Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
 Firefox 17.0.6esr
  _ Torbutton 1.5.2
- |_ NoScript 2.6.6.1
- |_ HTTPS-Everywhere 4.0development.6
+ |_ NoScript 2.6.6.2
+ |_ HTTPS-Everywhere 4.0development.8
  |_ PDF Viewer 0.8.1
Usage
diff --git a/README.WIN-2.4 b/README.WIN-2.4
index 9fd6561..f73eb59 100644
--- a/README.WIN-2.4
+++ b/README.WIN-2.4
@@ -5,11 +5,11 @@ Included applications
 ---------------------
Vidalia 0.2.21 (with Qt 4.8.1)
-Tor 0.2.4.12-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k)
+Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
 Firefox 17.0.6esr
  _ Torbutton 1.5.2
- |_ NoScript 2.6.6.1
- |_ HTTPS-Everywhere 4.0development.6
+ |_ NoScript 2.6.6.2
+ |_ HTTPS-Everywhere 4.0development.8
  |_ PDF Viewer 0.8.1
Usage
diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index 3a15d53..7121474 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -15,7 +15,7 @@
## Architecture
 ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=2
+BUILD_NUM=1
 PLATFORM=Linux
## Build machine specific settings
diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index 1429c5b..7ad744d 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -15,7 +15,7 @@
## Architecture
 ARCH_TYPE=i386
-BUILD_NUM=2
+BUILD_NUM=1
 PLATFORM=MacOS
## Set OSX-specific backwards compatibility options
diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index 53c146d..256f562 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -1,20 +1,20 @@
 #!/usr/bin/make
-RELEASE_VER=2.4.12-alpha
+RELEASE_VER=2.4.14-alpha
-ZLIB_VER=1.2.7
+ZLIB_VER=1.2.8
 OPENSSL_VER=1.0.0k
-LIBPNG_VER=1.5.15
+LIBPNG_VER=1.5.16
 QT_VER=4.8.1
 VIDALIA_VER=0.2.21
 LIBEVENT_VER=2.0.21-stable
-TOR_VER=0.2.4.12-alpha
+TOR_VER=0.2.4.14-alpha
 PIDGIN_VER=2.6.4
 FIREFOX_VER=17.0.6esr
 MOZBUILD_VER=1.5.1
 TORBUTTON_VER=1.5.2
-NOSCRIPT_VER=2.6.6.1
-HTTPSEVERYWHERE_VER=4.0development.6
+NOSCRIPT_VER=2.6.6.2
+HTTPSEVERYWHERE_VER=4.0development.8
 PDFJS_VER=0.8.1
 OBFSPROXY_VER=0.1.4
 OTR_VER=3.2.0
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index 76bd01e..56233c4 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -13,7 +13,7 @@
 ### Configuration ###
 #####################
-BUILD_NUM=2
+BUILD_NUM=1
 PLATFORM=Windows
## Location of required libraries
diff --git a/changelog.linux-2.4 b/changelog.linux-2.4
index ee2032b..5e5441a 100644
--- a/changelog.linux-2.4
+++ b/changelog.linux-2.4
@@ -1,3 +1,13 @@
+Tor Browser Bundle (2.4.14-alpha-1); suite=linux
+
+  * Update Tor to 0.2.4.14-alpha
+  * Update zlib to 1.2.8
+  * Update libpng to 1.5.16
+  * Update HTTPS Everywhere to 4.0development.8
+  * Update NoScript to 2.6.6.2
+
+ -- Erinn Clark erinn@torproject.org  Wed Jun 19 21:00:13 BRT 2013
+
 Tor Browser Bundle (2.4.12-alpha-2); suite=linux
* Update Firefox to 17.0.6esr
diff --git a/changelog.osx-2.4 b/changelog.osx-2.4
index c2210dd..462f044 100644
--- a/changelog.osx-2.4
+++ b/changelog.osx-2.4
@@ -1,3 +1,13 @@
+Tor Browser Bundle (2.4.14-alpha-1); suite=osx
+
+  * Update Tor to 0.2.4.14-alpha
+  * Update zlib to 1.2.8
+  * Update libpng to 1.5.16
+  * Update HTTPS Everywhere to 4.0development.8
+  * Update NoScript to 2.6.6.2
+
+ -- Erinn Clark erinn@torproject.org  Wed Jun 19 21:00:11 BRT 2013
+
 Tor Browser Bundle (2.4.12-alpha-2); suite=osx
* Update Firefox to 17.0.6esr
diff --git a/changelog.windows-2.4 b/changelog.windows-2.4
index 288c47d..bcfaff2 100644
--- a/changelog.windows-2.4
+++ b/changelog.windows-2.4
@@ -1,3 +1,13 @@
+Tor Browser Bundle (2.4.14-alpha-1); suite=windows
+
+  * Update Tor to 0.2.4.14-alpha
+  * Update zlib to 1.2.8
+  * Update libpng to 1.5.16
+  * Update HTTPS Everywhere to 4.0development.8
+  * Update NoScript to 2.6.6.2
+
+ -- Erinn Clark erinn@torproject.org  Wed Jun 19 21:00:16 BRT 2013
+
 Tor Browser Bundle (2.4.12-alpha-2); suite=windows
* Update Firefox to 17.0.6esr

    