Merge branch 'maint-0.3.5' into release-0.3.5

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

doc/tor.1.txt

@@ -2950,8 +2950,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