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

[nickm at torproject.org]

commit e515a69c0003afdf173834959ac17d3a86d2baeb
Merge: fd2ac75 1f4ae3d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 5 08:53:09 2020 -0500

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

 control-spec.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)