[tor-commits] [torspec/master] Merge branch 'ticket4631_squashed'

[nickm at torproject.org]

commit 0c42e77da8e8efd6c715bf0adba2b99a7a3b9f4e
Merge: 0e44723 a300681
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 20 08:19:21 2020 -0500

    Merge branch 'ticket4631_squashed'

 dir-spec.txt | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)