Release preparations for 8.5a1

Version bumps

projects/firefox/config

 # 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
@@ -9,7 +9,7 @@ gpg_keyring: torbutton.gpg
 var:
   firefox_platform_version: 60.2.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
-  torbrowser_branch: 8.0
+  torbrowser_branch: 8.5
   torbrowser_update_channel: alpha
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:

projects/tor-launcher/config

 # vim: filetype=yaml sw=2
-version: 0.2.16.3
+version: 0.2.16.4
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg

projects/tor/config

 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.3.3.9
+version: 0.3.4.7-rc
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1

rbm.conf

@@ -15,10 +15,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '8.0'
-  torbrowser_build: 'build5'
+  torbrowser_version: '8.5a1'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 7.5.6
+    - 8.0a10
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1