commit 671fb396987085fe2ced6ad1cd87e440c8d91b7c Merge: 1f52ffa 9c097a0 Author: David Goulet dgoulet@torproject.org Date: Tue Sep 22 09:20:37 2020 -0400

Merge branch 'tor-gitlab/mr/5'

tor-spec.txt | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-)