[tbb-commits] [tor-browser-build/master] Update ChangeLog, bump openssl, pick up Android translations

[sysrqb at torproject.org]

commit 62f969c8429b35db07fade25fbce25f1d32b7f6f
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Apr 2 18:56:14 2020 +0000

    Update ChangeLog, bump openssl, pick up Android translations
---
 projects/openssl/config                             | 2 +-
 projects/tba-translation/config                     | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++
 rbm                                                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/projects/openssl/config b/projects/openssl/config
index c0861b6..3d352ec 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.1.1d
+version: 1.1.1f
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 var:
diff --git a/projects/tba-translation/config b/projects/tba-translation/config
index 4056a6f..3b46b94 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: b31ac83a63ba8f0b63de07052c3e66ddff16c8aa
+git_hash: 922fec4c767aad5efb7411c2430f2b197b921045
 version: '[% c("abbrev") %]'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 737b3d8..1350b3f 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,6 +1,11 @@
 Tor Browser 9.5a10 -- April XX 2020
  * All Platforms
    * Bump Https-Everywhere to 2020.3.16
+ * Android
+   * Translations update
+ * Windows + OS X + Linux
+   * Bug 33771: Update some existing licenses and add Libevent license
+   * Bug 33723: Bump openssl version to 1.1.1f
 
 Tor Browser 9.5a9 -- March 25 2020
  * All Platforms
diff --git a/rbm b/rbm
index e4f12ab..5a41aae 160000
--- a/rbm
+++ b/rbm
@@ -1 +1 @@
-Subproject commit e4f12abe9ed81050994b5345c21b988005259396
+Subproject commit 5a41aae4a0d745f74b675d3c9c142b3d5fb3ca09