[tor-commits] [chutney/master] Merge remote-tracking branch 'DonnchaC/client-control-port'