Draft: Bug 40137 02

Matthew Finkelrequested to merge
sysrqb/tor-browser-build:bug_40137_02 into master

Rebased onto current master

Closes #40157 (closed)

Edited by Matthew Finkel

Merge request reports