tor-proto: Various refactorings and cleanups
This MR contains some refactorings I found myself doing while hacking on #1816 (closed)
None of this should change anything about the behavior of the circuit reactor (it's mostly just boring code motion).