nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'weasel/bug19504'

Browse Source
This commit is contained in:
Nick Mathewson 2016-06-29 16:18:00 -04:00
commit 11ba7f0037
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug19504 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (documentation):
- Document the --passphrase-fd option in the tor manpage.
Fixes bug 19504.

7
doc/tor.1.txt
View File

@ -118,6 +118,13 @@ COMMAND-LINE OPTIONS
directory of your Tor daemon, and make sure that they are owned by the directory of your Tor daemon, and make sure that they are owned by the
user actually running the Tor daemon on your system. 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 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 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 instance, you can tell Tor to start listening for SOCKS connections on port