Merge remote-tracking branch 'weasel/bug19505'

This commit is contained in:
Nick Mathewson 2016-06-29 16:12:15 -04:00
commit 560e976e4b
2 changed files with 6 additions and 1 deletions

5
changes/bug19505 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (documentation):
- Fix the description of the --passphrase-fd option in the tor-gencert
manpage. The option is used to pass the number of a file descriptor to
read the passphrase from, not to read the file descriptor from. Fixes
bug 19505.

View File

@ -68,7 +68,7 @@ OPTIONS
Number of months that the certificate should be valid. Default: 12.
**--passphrase-fd** __FILEDES__::
Filedescriptor to read the file descriptor from. Ends at the first NUL or
Filedescriptor to read the passphrase from. Ends at the first NUL or
newline. Default: read from the terminal.
**-a** __address__:__port__::