[tor-commits] [tor-browser-build/maint-8.5] Release preparations for 8.5.1

[gk at torproject.org]

commit 4fd074e59d14c3a4b43a308c796486ab84e5b113
Author: Georg Koppen <gk at torproject.org>
Date:   Fri May 31 11:25:08 2019 +0000

    Release preparations for 8.5.1
    
    Versions bump and Changelog update
---
 projects/firefox/config                             |  2 +-
 projects/https-everywhere/config                    |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++
 projects/torbutton/config                           |  2 +-
 rbm.conf                                            |  6 +++---
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 35dac3a..8547aca 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # 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-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 60776cb..2db9177 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2019.5.6.1
+version: 2019.5.13
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 83e2a2d..e881c48 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,21 @@
+Tor Browser 8.5.1 -- June 4 2019
+ * All platforms
+   * Update Torbutton to 2.1.10
+     * Bug 30565: Sync nocertdb with privatebrowsing.autostart at startup
+     * Bug 30464: Add WebGL to safer descriptions
+     * Translations update
+   * Update NoScript to 10.6.2
+     * Bug 29969: Remove workaround for Mozilla's bug 1532530
+   * Update HTTPS Everywhere to 2019.5.13
+   * Bug 30541: Disable WebGL readPixel() for web content
+ * Windows + OS X + Linux
+   * Bug 30560: Better match actual toolbar in onboarding toolbar graphic
+ * Android
+   * Bug 30635: Sync mobile default bridges list with desktop one
+ * Build System
+   * All platforms
+     * Bug 30480: Check that signed tag contains expected tag name
+
 Tor Browser 8.5 -- May 21 2019
  * All platforms
    * Update Firefox to 60.7.0esr
diff --git a/projects/torbutton/config b/projects/torbutton/config
index 971f0e6..43705ae 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2.1.8
+version: 2.1.10
 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 54f6c65..ee9e322 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '8.5'
-  torbrowser_build: 'build3'
+  torbrowser_version: '8.5.1'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 8.0.9
+    - 8.5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1