commit ba9064e4b5a369b9c70201e335ef706db25f2815 Merge: 799ccf0 f4b5f7b Author: Nicolas Vigier boklm@torproject.org Date: Tue Mar 5 21:45:55 2019 +0100

Merge remote-tracking branch 'gk/bug_27210_v3'

Conflicts: projects/orbot/build

Makefile | 15 +++++++++++ projects/android-toolchain/build | 10 +++++-- projects/firefox/config | 2 +- projects/firefox/mozconfig-android-x86 | 48 ++++++++++++++++++++++++++++++++++ projects/orbot/config | 2 +- projects/release/build | 3 +++ projects/release/config | 11 ++++++++ projects/rust/build | 5 +++- projects/rust/config | 12 ++++++--- projects/tor-browser/config | 2 +- rbm.conf | 15 ++++++++++- 11 files changed, 115 insertions(+), 10 deletions(-)