commit ab4a8d4433ba03de4189b438f8b3fb3ba3c8d985 Merge: 485abc9 57d1e7d Author: David Goulet dgoulet@torproject.org Date: Tue Dec 14 12:58:40 2021 -0500

Merge branch 'tor-gitlab/mr/55'

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