40267+1: Rebase 10.5 onto 84.0

Alex Catarineurequested to merge
acat/tor-browser:40267+1 into tor-browser-84.0-10.5-2

Supersedes !92 (closed).

Rebased onto FIREFOX_84_0_BUILD2.

Edited by Matthew Finkel

Merge request reports