Refactor about:torconnect implementation

Turns out, the first time wasn't the best design. Let's re-do it more smartly.