commit 99f739a2b2bde7e81d9f6a974efbdd2eca1b7947 Merge: 419b0be d226510 Author: Nicolas Vigier boklm@torproject.org Date: Mon Jul 1 19:21:55 2019 +0200

Merge remote-tracking branch 'gk/bug_28119_v6'

Makefile | 15 +++++++++ projects/android-toolchain/build | 8 ++--- projects/firefox/mozconfig-android-aarch64 | 50 ++++++++++++++++++++++++++++++ projects/release/build | 3 ++ projects/release/config | 10 ++++++ projects/rust/config | 4 +++ projects/tor-browser/build.android | 9 ++++-- rbm.conf | 14 ++++++++- 8 files changed, 104 insertions(+), 9 deletions(-)