[tor-commits] [torspec/master] Merge remote-tracking branch 'gitlab/merge-requests/30'

[ahf at torproject.org]

commit 46f0bb6320b1b3c3bee8c0be5aa785612fc4eec0
Merge: 8a6ef7b c24bfd8
Author: Alexander Færøy <ahf at torproject.org>
Date:   Mon Mar 1 14:54:18 2021 +0000

    Merge remote-tracking branch 'gitlab/merge-requests/30'

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