commit 0ce4d23af5cd6ca3a5fe7f8b931b07f171b7f4ed parent d1af4d65df8b5ef8049707029335049db147829f Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 22 Jan 2019 08:04:55 -0500 Merge branch 'maint-0.3.5' Diffstat:
| A | changes/bug28979 | | | 4 | ++++ |
| M | doc/tor.1.txt | | | 4 | ++-- |
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/changes/bug28979 b/changes/bug28979 @@ -0,0 +1,4 @@ + o Minor bugfixes (documentation): + - Describe the contents of the v3 onion service client authorization + files correctly: They hold public keys, not private keys. Fixes bug + 28979; bugfix on 0.3.5.1-alpha. Spotted by "Felixix". diff --git a/doc/tor.1.txt b/doc/tor.1.txt @@ -3012,8 +3012,8 @@ file name is irrelevant) and its content format MUST be: <auth-type>:<key-type>:<base32-encoded-public-key> The supported <auth-type> are: "descriptor". The supported <key-type> are: -"x25519". The <base32-encoded-privkey> is the base32 representation of the raw -key bytes only (32 bytes for x25519). +"x25519". The <base32-encoded-public-key> is the base32 representation of +the raw key bytes only (32 bytes for x25519). Each file MUST contain one line only. Any malformed file will be ignored. Client authorization will only be enabled for the service if tor