commit f6b89500953983b2fa2f8b2103e7a9772e3b1492 Merge: d1ae111 968e536 Author: Matthew Finkel sysrqb@torproject.org Date: Tue Sep 1 18:42:50 2020 +0000

Merge remote-tracking branch 'gkgl/bug_40002_v2'

Makefile | 16 +++++----- README.MAKEFILE | 4 +-- projects/firefox/build | 1 - projects/firefox/config | 2 +- projects/firefox/mozconfig-linux-x86_64-asan | 45 ++++++++++++++++++++++++++++ projects/release/config | 6 ++-- rbm.conf | 10 +++++-- 7 files changed, 66 insertions(+), 18 deletions(-)