[tbb-commits] [tor-browser-build/maint-10.5] Tor Browser 10.5.2 release preparations

[sysrqb at torproject.org]

commit 512c1587ef0974d6c7688aaf9b36233da3f478a0
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Jul 9 17:03:35 2021 +0000

    Tor Browser 10.5.2 release preparations
    
    Version bumps and Changelog update
---
 projects/firefox/config                             | 4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++
 rbm.conf                                            | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index a2c667e..d62d9ab 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-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
 git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 78.11.0
+  firefox_platform_version: 78.12.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.5
   branding_directory: 'browser/branding/alpha'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 06d533d..d96a6a2 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,10 @@
+Tor Browser 10.5.2 -- July 13 2021
+ * Windows + OS X + Linux
+   * Update Firefox to 78.12.0esr
+   * Bug 40497: Cannot set multiple pages as home pages in 10.5a17 [tor-browser]
+   * Bug 40507: Full update is not downloaded after applying partial update fails [tor-browser]
+   * Bug 40510: open tabs get redirected to about:torconnect on restart [tor-browser]
+
 Tor Browser 10.5.1 -- July 7 2021
  * Android
    * Bug 40324: Change Fenix variant to Release [fenix]
diff --git a/rbm.conf b/rbm.conf
index 7c69900..07b2b69 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -57,10 +57,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.5.1'
+  torbrowser_version: '10.5.2'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 10.0.18
+    - 10.5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1