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

[gk at torproject.org]

commit 0e0cb78f2d1625047a5800b16c23289fa7b28403
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Oct 2 20:25:35 2018 +0000

    Release preparations for 8.5a3
---
 projects/firefox/config                             | 4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++
 rbm.conf                                            | 6 +++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 89e5ce6..d79eec3 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,13 +1,13 @@
 # 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-build3'
+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
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 60.2.0
+  firefox_platform_version: 60.2.1
   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 9cd6c3f..94ab254 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,12 @@
+Tor Browser 8.5a3 -- October 4 2018
+ * All platforms
+   * Update Firefox to 60.2.1esr
+   * Backport fix for Mozilla bug 1493900 and 1493903
+ * Windows
+   * Bug 27865: Tor Browser 8.5a2 is crashing on Windows
+ * OS X
+   * Backport fix for Mozilla bug 1489785 for macOS 10.14 compatibility
+
 Tor Browser 8.5a2 -- September 24 2018
  * All platforms
    * Update Tor to 0.3.5.2-alpha
diff --git a/rbm.conf b/rbm.conf
index 0723a42..d7f1420 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '8.5a2'
-  torbrowser_build: 'build3'
+  torbrowser_version: '8.5a3'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 8.5a1
+    - 8.5a2
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1