Merge remote-tracking branch 'DonnchaC/client-control-port'

torrc_templates/client.tmpl

@@ -1,5 +1,7 @@
 ${include:common.i}
 SocksPort $socksport
+ControlPort $controlport
+CookieAuthentication 1
 
 #NOTE: Setting TestingClientConsensusDownloadSchedule doesn't
 #      help -- dl_stats.schedule is not DL_SCHED_CONSENSUS