[tbb-commits] [tor-browser-build/master] Release preparations for 8.5a6

[gk at torproject.org]

commit 76243271b0f02b0a965a0294ef8242c787bfc668
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Dec 6 22:31:40 2018 +0000

    Release preparations for 8.5a6
    
    Changelog update and versions bump
---
 projects/firefox-langpacks/config                  |  2 +-
 projects/firefox/config                            |  4 ++--
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt     | 24 ++++++++++++++++++++++
 projects/torbutton/config                          |  2 +-
 rbm.conf                                           |  5 +++--
 5 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 4e42939..04cd7dd 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build2
   ff_arch: linux-i686
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
diff --git a/projects/firefox/config b/projects/firefox/config
index 7ffaf43..639d504 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,14 +1,14 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 60.3.0
+  firefox_platform_version: 60.4.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 8.5
   torbrowser_update_channel: alpha
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 5c3732b..54645e8 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,27 @@
+Tor Browser 8.5a6 -- December 11 2018
+ * All Platforms
+   * Update Firefox to 60.4.0esr
+   * Update OpenSSL to 1.0.2q
+   * Update Torbutton to 2.1.3
+     * Bug 28540: Use new text for 2018 donation banner
+     * Bug 27290: Remove WebGL pref for min capability mode
+     * Bug 28075: Tone down missing SOCKS credential warning
+     * Bug 28747: Remove NoScript (XPCOM) related unused code
+     * Translations update
+   * Bug 28608: Disable background HTTP response throttling
+   * Bug 28695: Set default security.pki.name_matching_mode to enforce (3)
+   * Bug 27290: Remove WebGL pref for min capability mode
+   * Bug 27919: Backport SSL status API
+ * Windows
+   * Bug 28740: Adapt Windows navigator.platform value on 64-bit systems
+ * Android
+   * Bug 26843: Multi-locale support for Tor Browser on Android
+ * Build System
+   * Android
+     * Bug 25164: Add .apk to our sha256sums unsigned build file
+     * Bug 28696: Make path to Gradle dependencies reproducible
+     * Bug 28697: Use pregenerated keystore and fix timestamp issues
+
 Tor Browser 8.5a5 -- December 3 2018
  * All Platforms
    * Update Torbutton to 2.1.2
diff --git a/projects/torbutton/config b/projects/torbutton/config
index 2e48f31..0fff877 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2.1.2
+version: 2.1.3
 git_url: https://git.torproject.org/torbutton.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index f64a80b..a397752 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '8.5a5'
-  torbrowser_build: 'build2'
+  torbrowser_version: '8.5a6'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 8.5a4
+    - 8.5a5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1