New polling logic for Tor

Subtask of #116 (closed).