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

[nickm at torproject.org]

commit b592584b6ae3365158d610288cad8324e41b19f8
Merge: 7ced619 a8a838f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 20 10:43:57 2018 -0400

    Merge branch 'ticket26647_v2'

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