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

[nickm at torproject.org]

commit 3efcd9340baa02c346448d31be0db5b3b8d40272
Merge: d09c357 378699c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 29 10:17:10 2017 -0400

    Merge branch 'ticket22684_spec'

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