[tor-commits] [torspec/master] Merge remote-tracking branch 'asn/bug22052'

[nickm at torproject.org]

commit 32fcd66b5a0abe4f9505f25f8a8da6d65407e423
Merge: c07abd0 6d0b14f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 30 08:43:34 2017 -0400

    Merge remote-tracking branch 'asn/bug22052'

 proposals/224-rend-spec-ng.txt | 45 ++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 15 deletions(-)