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

[nickm at torproject.org]

commit 32002ec49235ebf925e5da8699e148f0367d4bb6
Merge: 698d630 34518e1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 24 17:19:03 2019 -0500

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

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