[tor-commits] [tor/master] Actually, the tor --passphrase-fd is different from the tor-gencert one

[nickm at torproject.org]

commit 869e5688b7856b0ceb8290a76a651a7f4306e926
Author: Peter Palfrader <peter at palfrader.org>
Date:   Sat Jun 25 16:53:07 2016 +0200

    Actually, the tor --passphrase-fd is different from the tor-gencert one
---
 doc/tor.1.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b2f5cfa..782c109 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