commit b3b17e038c4a9efe553bd07a766fb3c2a47ba9f5 Merge: f78a258 7b518ea Author: Matthew Finkel sysrqb@torproject.org Date: Fri Jul 2 17:16:06 2021 +0000

Merge remote-tracking branch 'boklmgl/bug_40314'

Makefile | 9 ++ projects/firefox/config | 10 ++ projects/firefox/list_toolchain_updates_checks | 194 +++++++++++++++++++++++++ projects/macosx-toolchain/config | 6 +- 4 files changed, 216 insertions(+), 3 deletions(-)