[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_31564_v2'

[gk at torproject.org]

commit 708ce94dba87d70033d61c930c542cc924dee9ad
Merge: c14d736 57732f7
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Oct 8 06:43:02 2019 +0000

    Merge remote-tracking branch 'boklm/bug_31564_v2'

 projects/tor-browser/build.android | 15 +++++++++++++--
 projects/tor-browser/config        |  4 ++++
 2 files changed, 17 insertions(+), 2 deletions(-)