aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2016-06-25 16:53:07 +0200
committerPeter Palfrader <peter@palfrader.org>2016-06-25 16:53:07 +0200
commit869e5688b7856b0ceb8290a76a651a7f4306e926 (patch)
tree5a60b4cf5b5df0fc86d4779cafc5147767734785 /doc
parent90f85b012a01a02c62863932394997e3f8b938a2 (diff)
downloadtor-869e5688b7856b0ceb8290a76a651a7f4306e926.tar.gz
tor-869e5688b7856b0ceb8290a76a651a7f4306e926.zip
Actually, the tor --passphrase-fd is different from the tor-gencert one
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b2f5cfa82a..782c1094e1 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -119,8 +119,10 @@ COMMAND-LINE OPTIONS
user actually running the Tor daemon on your system.
**--passphrase-fd** __FILEDES__::
- Filedescriptor to read the passphrase from. Ends at the first NUL or
- newline. Default: read from the terminal.
+ Filedescriptor to read the passphrase from. Note that unlike with the
+ tor-gencert program, the entire file contents are read and used as
+ the passphrase, including any trailing newlines.
+ Default: read from the terminal.
Other options can be specified on the command-line in the format "--option