[tor-commits] [tor-browser-bundle/master] Pick up build3 from Mozilla and bug fixes

[gk at torproject.org]

commit 421091532d3536893e715f62cab9055cd822b95a
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Apr 18 11:26:23 2017 +0000

    Pick up build3 from Mozilla and bug fixes
---
 Bundle-Data/Docs/ChangeLog.txt | 3 +++
 gitian/versions.alpha          | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 3d36c6e..b2ee463 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -58,10 +58,12 @@ Tor Browser 7.0a3 -- April 20 2017
    * Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID
    * Bug 21724: Make Firefox and Tor Browser distinct macOS apps
    * Bug 21931: Backport OSX SetupMacCommandLine updater fixes
+   * Bug 15910: Don't download GMPs via the local fallback
  * Linux
    * Bug 21907: Fix runtime error on CentOS 6
    * Bug 21748: Fix broken Snowflake build and update bridge details
    * Bug 21954: Snowflake breaks the 7.0a3 build
+   * Bug 15910: Don't download GMPs via the local fallback
  * Build system
    * Windows
      * Bug 21837: Fix reproducibility of accessibility code for Windows
@@ -78,6 +80,7 @@ Tor Browser 7.0a3 -- April 20 2017
    * Linux
      * Bug 21930: NSS libraries are missing from mar-tools archive
      * Bug 21239: Adapt Linux Firefox descriptor to ESR52 (use GTK2)
+     * Bug 21960: Linux bundles based on ESR 52 are not reproducible anymore
      * Bug 21629: Fix broken ASan builds when switching to ESR 52
 
 Tor Browser 7.0a2-hardened -- March 7 2017
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index b16341a..fffb050 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -14,7 +14,7 @@ FIREFOX_VERSION=52.1.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2-build1
 TOR_TAG=tor-0.3.0.5-rc
 TORLAUNCHER_TAG=0.2.12
 TORBUTTON_TAG=1.9.7.2
@@ -48,12 +48,12 @@ GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101
 SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492
 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a
 
-GITIAN_TAG=tor-browser-builder-4-3
+GITIAN_TAG=tor-browser-builder-4-4
 
 OPENSSL_VER=1.0.2k
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build2
+FIREFOX_LANG_BUILD=build3
 BINUTILS_VER=2.24
 GCC_VER=5.1.0
 CLANG_VER=3.8.0