Bug 40241 v7

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

Closes #40241 (closed)

(99% of the work done by boklm)

cc @gk

Merge request reports