diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-29 16:18:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-29 16:18:00 -0400 |
| commit | 11ba7f00371ef3ed7b9fd353aad4e3e672239a40 (patch) | |
| tree | c670fa166b5e84973a7e1702a7b7c55a23cf6a2d | |
| parent | ff5b10c9161f7ffd2fb2758241ff893b76c1807c (diff) | |
| parent | 869e5688b7856b0ceb8290a76a651a7f4306e926 (diff) | |
| download | tor-11ba7f00371ef3ed7b9fd353aad4e3e672239a40.tar.gz tor-11ba7f00371ef3ed7b9fd353aad4e3e672239a40.zip | |
Merge remote-tracking branch 'weasel/bug19504'
| -rw-r--r-- | changes/bug19504 | 3 | ||||
| -rw-r--r-- | doc/tor.1.txt | 7 |
2 files changed, 10 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 65d3c2d5f5..b49ebfd121 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -118,6 +118,13 @@ 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. 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 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 |