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

[nickm at torproject.org]

commit 486455bbed02276c0dd5b228f06b15b90b521d47
Merge: 815a710 43c2f78
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 3 19:17:06 2018 -0400

    Merge remote-tracking branch 'teor/bug25284'

 dir-spec.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)