[tor-commits] [torspec/master] Merge remote-tracking branch 'juga/ticket26222'

[nickm at torproject.org]

commit 6533c852328f5b18bd36c249ba7bb8f9b66ab1c2
Merge: 419ba0c b36cc50
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jun 17 19:27:52 2018 -0400

    Merge remote-tracking branch 'juga/ticket26222'

 dir-spec.txt | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)