commit e97e3032a3ef9b47f2d60c03a61f27ab63539522 Merge: 51dc1a3 64a37a8 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 12 08:45:38 2015 -0400 Merge remote-tracking branch 'DonnchaC/client-control-port' torrc_templates/client.tmpl | 2 ++ 1 file changed, 2 insertions(+)