Review+Merge Torctl fixes
Damian has gone on a TorCtl patching frenzy. I need to review 7 or so of his patches: https://trac.torproject.org/projects/tor/query?status=needs_review&group=milestone&component=Torctl&order=priority&col=id&col=summary&col=component&col=status&col=type&col=priority&col=milestone&col=version&col=keywords