summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorrl1987 <rl1987@sdf.lonestar.org>2015-01-26 21:33:19 +0200
committerNick Mathewson <nickm@torproject.org>2015-02-02 13:31:56 -0500
commit1ebed7cc7758fdfc3786ef9c1edfa4388f43e8e2 (patch)
treeeebf9471a35c0d1e4b44d331b9926be38bc02ae5 /doc
parent313e2a7dabbe9cc32c9db231cf5c97dee77cdea9 (diff)
downloadtor-1ebed7cc7758fdfc3786ef9c1edfa4388f43e8e2.tar.gz
tor-1ebed7cc7758fdfc3786ef9c1edfa4388f43e8e2.zip
Updating manpage for 13865.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 5302b33bd1..4d7069ee23 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**::