summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2016-06-25 16:44:41 +0200
committerPeter Palfrader <peter@palfrader.org>2016-06-25 16:44:41 +0200
commit90f85b012a01a02c62863932394997e3f8b938a2 (patch)
tree3d84ca89f1be736f28420337736be03368f880c4
parent421a7c8c35064993cf4ce344e4b0fab06e7df3a4 (diff)
downloadtor-90f85b012a01a02c62863932394997e3f8b938a2.tar.gz
tor-90f85b012a01a02c62863932394997e3f8b938a2.zip
Document the --passphrase-fd option in the tor manpage
-rw-r--r--changes/bug195043
-rw-r--r--doc/tor.1.txt5
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug19504 b/changes/bug19504
new file mode 100644
index 0000000000..1a7676a1e3
--- /dev/null
+++ b/changes/bug19504
@@ -0,0 +1,3 @@
+ o Minor bugfixes (documentation):
+ - Document the --passphrase-fd option in the tor manpage.
+ Fixes bug 19504.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 74915b7119..b2f5cfa82a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -118,6 +118,11 @@ COMMAND-LINE OPTIONS
directory of your Tor daemon, and make sure that they are owned by the
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.
+
+
Other options can be specified on the command-line in the format "--option
value", in the format "option value", or in a configuration file. For
instance, you can tell Tor to start listening for SOCKS connections on port