Rebase tor-browser patches to 87.0b4

ff7603ae