[tor-commits] [torspec/master] Merge remote-tracking branch 'dgoulet/ticket20699_02'

[nickm at torproject.org]

commit aac4775ffd25d454eb451596e8835998e926109d
Merge: 48e41c5 7ad96f1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 5 19:45:29 2017 -0500

    Merge remote-tracking branch 'dgoulet/ticket20699_02'

 proposals/284-hsv3-control-port.txt | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)