Merge branch 'maint-0.3.5'

This commit is contained in:
Nick Mathewson 2019-01-22 08:04:55 -05:00
commit 0ce4d23af5
2 changed files with 6 additions and 2 deletions

4
changes/bug28979 Normal file
View File

@ -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".

View File

@ -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