[tor-commits] [torspec/master] Merge branch 'feature23237_spec'

[nickm at torproject.org]

commit 66cafba616c108b5d17feb373a36a2259c445bd4
Merge: 6e887ba dc973f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 8 08:10:39 2017 -0400

    Merge branch 'feature23237_spec'

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