[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/25'

[nickm at torproject.org]

commit 8e7137616194770eb99534b3426692f24f8c973c
Merge: 8bc330e d05176b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 25 13:35:41 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/25'

 proposals/196-transport-control-ports.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)