Rebase tor-browser patches to 89.0b2

Edited by Matthew Finkel