[tor-commits] [torspec] 06/06: Merge remote-tracking branch 'tor-gitlab/mr/113'

[gitolite role]

This is an automated email from the git hooks/post-receive script.

nickm pushed a commit to branch main
in repository torspec.

commit e8aea8668870f9652b1d5c7446bed56d92c9f37d
Merge: 7838586 28cc4dc
Author: Nick Mathewson <nickm at torproject.org>
AuthorDate: Wed Feb 8 11:40:11 2023 -0500

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

 rend-spec-v3.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --cc rend-spec-v3.txt
index 947d82e,fb570b4..13eb758
--- a/rend-spec-v3.txt
+++ b/rend-spec-v3.txt
@@@ -2071,7 -2071,12 +2071,10 @@@ Table of contents
     One mechanism to do so is the credential mechanism, where only users who
     know the credential for a hidden service may connect at all.
  
- 3.4.1. Ed25519-based authentication.
 -   There are two defined authentication types, `ed25519` and `password`.
++   There is one defined authentication type: `ed25519`.
+ 
 -   However, the `password` authentication type is not documented
 -   and ??? ??? ???.
+ 
+ 3.4.1. Ed25519-based authentication `ed25519`.
  
     To authenticate with an Ed25519 private key, the user must include an
     extension field in the encrypted part of the INTRODUCE1 cell with an

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.