commit a7e90a70837f085cdca27245f96fe4a448e8d929 Merge: dc1c703 68c652e Author: Matthew Finkel sysrqb@torproject.org Date: Thu Sep 10 15:54:02 2020 +0000

Merge remote-tracking branch 'gkgl/bug_40078'

projects/android-toolchain/build | 8 +++++--- projects/android-toolchain/config | 24 ++++++++++++++---------- projects/fenix/build | 4 ++-- 3 files changed, 21 insertions(+), 15 deletions(-)