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

[nickm at torproject.org]

commit 10d5417f9d8c1503394c8bca0f97c772f02f808f
Merge: e2145ba ab22bd1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 2 19:12:25 2018 -0400

    Merge remote-tracking branch 'filippo/master'

 dir-spec.txt     | 37 +++++++++++++------------------------
 rend-spec-v3.txt | 18 ++++++++++++++----
 2 files changed, 27 insertions(+), 28 deletions(-)