[tbb-commits] [tor-browser-bundle/master] Prepare 4.5-alpha-3 release

[gk at torproject.org]

commit 3946059dcf9c3125f9106c5f97a4f260776a3c6f
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Jan 14 10:55:53 2015 +0000

    Prepare 4.5-alpha-3 release
    
    Update changelog; update config.yml; bump versions
---
 Bundle-Data/Docs/ChangeLog.txt    |   31 +++++++++++++++++++++++++++++++
 gitian/versions.alpha             |   18 +++++++++---------
 tools/update-responses/config.yml |   15 +++++----------
 3 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 11cf88b..7416e0c 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,34 @@
+Tor Browser 4.5-alpha-3 -- Jan 16 2015
+ * All Platforms
+   * Update Firefox to 31.4.0esr
+   * Update Tor to 0.2.6.2-alpha
+   * Update NoScript to 2.6.9.10
+   * Update HTTPS Everywhere to 5.0development.2
+   * Update meek to 0.15
+   * Update Torbutton to 1.8.1.3
+     * Bug 13998: Handle changes in NoScript 2.6.9.8+
+     * Bug 14100: Option to hide NetworkSettings menuitem
+     * Bug 13079: Option to skip control port verification
+     * Bug 13835: Option to change default Tor Browser homepage
+     * Bug 11449: Fix new identity error if NoScript is not enabled
+     * Bug 13881: Localize strings for tor circuit display
+     * Bug 9387: Incorporate user feedback
+     * Bug 13671: Fixup for circuit display if bridges are used
+     * Translation updates
+  * Update Tor Launcher to 0.2.7.1
+    * Translation updates
+  * Bug 13379: Sign our MAR files
+  * Bug 13788: Fix broken meek in 4.5-alpha series
+  * Bug 13439: No canvas prompt for content callers
+
+Tor Browser 4.0.3 -- Jan 13 2015
+ * All Platforms
+   * Update Firefox to 31.4.0esr
+   * Update NoScript to 2.6.9.10
+   * Update meek to 0.15
+   * Update Tor Launcher to 0.2.7.0.2
+     * Translation updates only
+
 Tor Browser 4.5-alpha-2 -- Dec 5 2014
  * All Platforms
    * Update Firefox to 31.3.0esr
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 1dd1fdf..890b6a3 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -4,14 +4,14 @@ BUILD_PT_BUNDLES=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=31.3.0esr
+FIREFOX_VERSION=31.4.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1
-TOR_TAG=tor-0.2.6.1-alpha
-TORLAUNCHER_TAG=0.2.7.0.1
-TORBUTTON_TAG=1.8.1.2
+TOR_TAG=tor-0.2.6.2-alpha
+TORLAUNCHER_TAG=0.2.7.1
+TORBUTTON_TAG=1.8.1.3
 HTTPSE_TAG=3.5.3  # XXX: HTTPSE_VER is used instead, pending #11630
 NSIS_TAG=v0.2
 ZLIB_TAG=v1.2.8
@@ -36,7 +36,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7
 OPENSSL_VER=1.0.1i
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build2
+FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.24
 GCC_VER=4.9.1
 PYTHON_VER=2.7.5
@@ -50,13 +50,13 @@ PY2EXE_VER=0.6.9
 SETUPTOOLS_VER=1.4
 LXML_VER=3.3.5
 PARSLEY_VER=1.2
-HTTPSE_VER=5.0development.1
+HTTPSE_VER=5.0development.2
 GO_VER=1.3.3
 
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.5-sm+fn+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+fn.xpi
 HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
@@ -86,8 +86,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a
-HTTPSE_HASH=d97ec822641d4ebf404fee1179497e1d80f2b8344d5fa485169ef045ba184db0
+NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42
+HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 6b0018d..37c0ead 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -6,19 +6,14 @@ build_targets:
     osx32: Darwin_x86-gcc3
     osx64: Darwin_x86_64-gcc3
 channels:
-    release: 4.0.2
-    alpha: 4.5-alpha-2
+    alpha: 4.5-alpha-3
 versions:
-    4.0.2:
-        platformVersion: 31.3.0
+    4.5-alpha-3:
+        platformVersion: 31.4.0
         detailsURL: https://www.torproject.org/projects/torbrowser.html.en
-        download_url: https://www.torproject.org/dist/torbrowser/4.0.2
-    4.5-alpha-2:
-        platformVersion: 31.3.0
-        detailsURL: https://www.torproject.org/projects/torbrowser.html.en
-        download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-2
+        download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-3
         incremental_from:
-          - 4.5-alpha-1
+          - 4.5-alpha-2
         migrate_archs:
           osx32: osx64
         osx32: