[tor-commits] [torspec/master] Merge remote-tracking branch 'mikeperry/bug25903_v3'

[nickm at torproject.org]

commit 436d08b49fb84aa62d7bc96013002a0c27534bbb
Merge: 1f7657e fbb38ec
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 14 14:26:06 2018 -0400

    Merge remote-tracking branch 'mikeperry/bug25903_v3'

 control-spec.txt | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)