commit 111839f176890ab37b28b00b5c05f03b46874098 Merge: df41296 b92dd33 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 13 14:54:14 2020 -0400

Merge remote-tracking branch 'tor-gitlab/mr/6'

dir-spec.txt | 56 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 26 deletions(-)