Backport torbutton -> tor-browser migration to 12.0 series

We really don't want to be backporting tor-brower -> torbutton patches until Summer, so let's backport this migration to make future us less sad.