[tor-commits] [torspec/main] Merge remote-tracking branch 'tor-gitlab/mr/60'

[nickm at torproject.org]

commit 80e9d9e7dbbc3642a7e93946f48b5fa2fc568b3f
Merge: 71c326a fa940c0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 24 10:54:05 2022 -0500

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

 proposals/332-ntor-v3-with-extra-data.md | 28 +++++++++++++++++++---------
 rend-spec-v3.txt                         | 27 ++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 10 deletions(-)