[tbb-commits] [tor-browser-build/maint-10.0-android] Release preparations for 10.0.5

[gk at torproject.org]

commit d42ce5292a115a1ee6f0e50630be673caac3dae3
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Nov 26 04:12:47 2020 +0000

    Release preparations for 10.0.5
    
    Versions bump and Changelog update
---
 projects/tba-translation/config                     |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++
 projects/tor/config                                 |  2 +-
 rbm.conf                                            |  4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/projects/tba-translation/config b/projects/tba-translation/config
index b2def42..2675514 100644
--- a/projects/tba-translation/config
+++ b/projects/tba-translation/config
@@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 git_url: https://git.torproject.org/translation.git
 # We need to bump the commit before releasing but just pointing to a branch
 # might cause too much rebuidling of the Firefox part.
-git_hash: 96c5386d045d7413c4e208337aed7465fb0a666d
+git_hash: a54899c8133efe536b48789e191fdd74fad64f53
 version: '[% c("abbrev") %]'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index d2a1d12..334c001 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,17 @@
+Tor Browser 10.0.5 -- November 27 2020
+ * Android
+   * Update Fenix to 83.1.0
+   * Update Tor to 0.4.4.6
+   * Translations update
+   * Bug 40212: Add new default bridge [tor-browser]
+ * Build System
+   * Android
+     * Bug 40126: Update toolchains for Fenix 83 [tor-browser-build]
+     * Bug 40126: Bump Node to 10.22.1 for mozilla83 [tor-browser-build]
+     * Bug 40127: Update GeckoView to 83, android-components to 63.0.1, and Fenix to 83.0.0b2 [tor-browser-build]
+     * Bug 40160: Update Fenix to 83.1.0, and android-components to 63.0.9 [tor-browser-build]
+     * Bug 40211: Lower required build-tools version to 29.0.2 [tor-browser]
+
 Tor Browser 10.0.4 -- November 9 2020
  * Android
    * Pick up fix for Mozilla's bug 1675905 (with GeckoView 82.0.3)
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 07545fb..bdfe028 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,8 +24,8 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.4'
-  torbrowser_build: 'build2'
+  torbrowser_version: '10.0.5'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 10.5a1
   project_name: tor-browser