diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-02 13:32:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-02 13:32:53 -0500 |
| commit | 79c7625e38893920a80451ba420ee45ccd67f79b (patch) | |
| tree | 67f108afb87191ad78751f94a0c7c72549de75ea /doc/tor.1.txt | |
| parent | 69deab8b2a5f09577fa4f15190c3aac181f5b6af (diff) | |
| parent | 1ebed7cc7758fdfc3786ef9c1edfa4388f43e8e2 (diff) | |
| download | tor-79c7625e38893920a80451ba420ee45ccd67f79b.tar.gz tor-79c7625e38893920a80451ba420ee45ccd67f79b.zip | |
Merge branch 'feature13864_squashed'
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 99ab8cb0b3..1349bf35b5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -42,7 +42,8 @@ COMMAND-LINE OPTIONS [[opt-f]] **-f** __FILE__:: Specify a new configuration file to contain further Tor configuration - options. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not + options OR pass *-* to make Tor read its configuration from standard + input. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) [[opt-allow-missing-torrc]] **--allow-missing-torrc**:: |