[tor-commits] [tor-browser-bundle/maint-6.5] Release preparations for 6.5.1

[gk at torproject.org]

commit dbbc765ad9ba158a7538255a5c7a027e859a106f
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Mar 3 08:11:35 2017 +0000

    Release preparations for 6.5.1
    
    build2 bumps the Torbutton and Tor Browser branch to pick up last minute
    bug fixes.
---
 Bundle-Data/Docs/ChangeLog.txt | 4 ++--
 gitian/versions                | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 571b677..311a894 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -3,13 +3,13 @@ Tor Browser 6.5.1 -- March 6 2017
    * Update Firefox to 45.8.0esr
    * Tor to 0.2.9.10
    * OpenSSL to 1.0.2k
-   * Update Torbutton to 1.9.6.13
+   * Update Torbutton to 1.9.6.14
      * 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
      * Translation updates
    * Update HTTPS-Everywhere to 5.2.11
-   * Bug 21514: Back out backported W^X patches due to conflicts in 45.8.0esr
+   * 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
  * Linux
diff --git a/gitian/versions b/gitian/versions
index f7c21df..df49b55 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -14,10 +14,10 @@ FIREFOX_VERSION=45.8.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-2-build1
 TOR_TAG=tor-0.2.9.10
 TORLAUNCHER_TAG=0.2.10.3
-TORBUTTON_TAG=1.9.6.13
+TORBUTTON_TAG=1.9.6.14
 HTTPSE_TAG=5.2.11
 NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
@@ -47,7 +47,7 @@ GITIAN_TAG=tor-browser-builder-4-1
 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.1.0
 CLANG_VER=r247539