Bug 40156 v6

Georg Koppenrequested to merge
gk/tor-browser-build:bug_40156_v6 into master

Closes #40140 (closed), #40155 (closed), #40156 (closed).

Edited by Georg Koppen

Merge request reports