[tbb-commits] [tor-browser-build/maint-10.0-desktop] Tor Browser 10.0.5 release preparations

[sysrqb at torproject.org]

commit e0a96b77fd9c81799734a3dab85b7452c7882a87
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Nov 12 19:00:52 2020 +0000

    Tor Browser 10.0.5 release preparations
    
    Version bumps and Changelog update
---
 projects/firefox-langpacks/config                   | 2 +-
 projects/firefox/config                             | 4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++
 projects/tor/config                                 | 2 +-
 rbm.conf                                            | 3 ++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 17a707a..34d6fad 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: build2
+  ff_build: build1
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
 targets:
diff --git a/projects/firefox/config b/projects/firefox/config
index af0d742..4479b40 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") %]-2-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.4.0
+  firefox_platform_version: 78.5.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.0
   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 526db49..3b26ac5 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,9 @@
+Tor Browser 10.0.5 -- November 17 2020
+ * Windows + OS X + Linux
+   * Update Firefox to 78.5.0esr
+   * Update Tor to 0.4.4.6
+   * Bug 40212: Add new default obfs4 bridge [tor-browser]
+
 Tor Browser 10.0.4 -- November 9 2020
  * Windows + OS X + Linux
    * Update NoScript to 11.1.5
diff --git a/projects/tor/config b/projects/tor/config
index 429e7d6..3050d7d 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.4.4.5
+version: 0.4.4.6
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1
diff --git a/rbm.conf b/rbm.conf
index ad6d5f7..ac496bc 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.4'
+  torbrowser_version: '10.0.5'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 10.0.2
+    - 10.0.4
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1