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

[nickm at torproject.org]

commit e1f74209f672cc3395a93be32bd9c013d72aaa1f
Merge: f9b2bdb 1412d79
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 3 09:37:36 2017 -0400

    Merge branch 'ticket22042_01'

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