[tor-commits] [torspec/master] Merge remote-tracking branch 'public/bug24378_spec'

[nickm at torproject.org]

commit fb33ac263fc0b008dd1f568dd4b5d6e89e636f23
Merge: f59414d 708d046
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Apr 22 20:02:09 2018 -0400

    Merge remote-tracking branch 'public/bug24378_spec'

 dir-spec.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)