Migrate remaining tor-launcher functionality to tor-browser

Tracking ticket for issues related to this

Edited by morgan