Bug 40002 v2

Merged Georg Koppen requested to merge gk/tor-browser-build:bug_40002_v2 into master

Closes #40002 (closed).

Merge request reports