Draft: Bug 40040 v2

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

Merge request reports