[tbb-commits] [tor-browser-bundle/hardened-builds] Release preparations for 7.0a2-hardened

[gk at torproject.org]

commit dcfd2efd5b155830e4d9443b9f6b69f60313e6fb
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Mar 6 08:12:25 2017 +0000

    Release preparations for 7.0a2-hardened
    
    Version bumps, Changelog update, and update of config.yml
---
 Bundle-Data/Docs/ChangeLog.txt    | 20 ++++++++++++++++++++
 gitian/versions.alpha             | 14 +++++++-------
 tools/update-responses/config.yml | 10 +++++-----
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index f349311..c192940 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,23 @@
+Tor Browser 7.0a2-hardened -- March 7 2017
+ * All Platforms
+   * Update Firefox to 45.8.0esr
+   * Tor to 0.3.0.4-rc
+   * OpenSSL to 1.0.2k
+   * Update Torbutton to 1.9.7.1
+     * Bug 21396: Allow leaking of resource/chrome URIs (off by default)
+     * Bug 21574: Add link for zh manual and create manual links dynamically
+     * Bug 21330: Non-usable scrollbar appears in tor browser security settings
+     * Bug 21324: Don't update NoScript button with timer update
+     * Translation updates
+   * Update HTTPS-Everywhere to 5.2.11
+   * Bug 21514: Restore W^X JIT implementation removed from ESR45
+   * Bug 21536: Remove scramblesuit bridge
+   * Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge
+   * Bug 21326: Update the "Using a system-installed Tor" section in start script
+ * Build system
+   * Bug 17034: Use our built binutils and GCC for building tor
+   * Code clean-up
+
 Tor Browser 7.0a1-hardened -- January 25 2017
  * All Platforms
    * Update Firefox to 45.7.0esr
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index aaacef9..e3352c4 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -14,15 +14,15 @@ DATA_OUTSIDE_APP_DIR=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=45.7.0esr
+FIREFOX_VERSION=45.8.0esr
 
 TORBROWSER_UPDATE_CHANNEL=hardened
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1
-TOR_TAG=tor-0.3.0.2-alpha
+TOR_TAG=tor-0.3.0.4-rc
 TORLAUNCHER_TAG=0.2.11.1
-TORBUTTON_TAG=1.9.7
-HTTPSE_TAG=5.2.9
+TORBUTTON_TAG=1.9.7.1
+HTTPSE_TAG=5.2.11
 NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.22-stable
@@ -55,10 +55,10 @@ UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a
 
 GITIAN_TAG=tor-browser-builder-4-1
 
-OPENSSL_VER=1.0.2j
+OPENSSL_VER=1.0.2k
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build1
+FIREFOX_LANG_BUILD=build2
 BINUTILS_VER=2.24
 GCC_VER=5.4.0
 CLANG_VER=r247539
@@ -110,7 +110,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf
 ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2
 
 # Hashes for packages with weak sigs or no sigs
-OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431
+OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 21c039b..0f112a3 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -20,7 +20,7 @@ build_targets:
     osx32: Darwin_x86-gcc3
     osx64: Darwin_x86_64-gcc3
 channels:
-    hardened: 7.0a1-hardened
+    hardened: 7.0a2-hardened
     release: 6.0.1
 versions:
     6.0.1:
@@ -33,11 +33,11 @@ versions:
         osx32:
             minSupportedOSVersion: 10.8
             detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#updating
-    7.0a1-hardened:
-        platformVersion: 45.7.0
-        detailsURL: https://blog.torproject.org/blog/tor-browser-70a1-hardened-released
+    7.0a2-hardened:
+        platformVersion: 45.8.0
+        detailsURL: https://blog.torproject.org/blog/tor-browser-70a2-hardened-released
         incremental_from:
-          - 6.5a6-hardened
+          - 7.0a1-hardened
         migrate_archs:
           osx32: osx64
         osx32: