[tor-commits] [tor-browser-build/master] Merge branch 'bug_29843'

[gk at torproject.org]

commit 3ba210064197298ad1c54ca74f086a67653109a2
Merge: 516887a b619af7
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Apr 11 10:23:30 2019 +0000

    Merge branch 'bug_29843'

 projects/firefox/1527534.patch | 139 +++++++++++++++++++++++++++++++++++++++++
 projects/firefox/build         |   6 ++
 projects/firefox/config        |   2 +
 3 files changed, 147 insertions(+)

diff --cc projects/firefox/config
index 9eabf05,41f7fbd..c455d21
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@@ -166,6 -166,5 +166,8 @@@ input_files
    - project: firefox-locale-bundle
      name: firefox-locale-bundle
      enable: '[% c("var/android") %]'
 +  - project: tba-translation
 +    name: tba-translation
 +    enable: '[% c("var/android") %]'
+   - filename: 1527534.patch
+     enable: '[% c("var/android") %]'