[tor-commits] [torspec/master] Merge remote-tracking branch 'teor/ticket26885'

[nickm at torproject.org]

commit 33792220b2aa3f6294aa5fc86d7f27c2038745c3
Merge: c95c1bb 42eb1fd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 8 14:20:53 2018 -0400

    Merge remote-tracking branch 'teor/ticket26885'

 tor-spec.txt | 62 ++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 18 deletions(-)