diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-22 08:04:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-22 08:04:55 -0500 |
| commit | 0ce4d23af5cd6ca3a5fe7f8b931b07f171b7f4ed (patch) | |
| tree | 9d0071f1be7b2c195cf20adbd2825f33a942e9f5 /doc/tor.1.txt | |
| parent | d1af4d65df8b5ef8049707029335049db147829f (diff) | |
| parent | 9ce1978b5ea630bca699eb1cf7f3f1c178f8e939 (diff) | |
| download | tor-0ce4d23af5cd6ca3a5fe7f8b931b07f171b7f4ed.tar.gz tor-0ce4d23af5cd6ca3a5fe7f8b931b07f171b7f4ed.zip | |
Merge branch 'maint-0.3.5'
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 92355dfb54..00d6929c19 100644 --- 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 |