diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-01 21:00:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-01 21:00:30 -0400 |
| commit | dfc32177d9ec3b8a639d6831ca4bc92c4f273dcb (patch) | |
| tree | c59d8dbfa789ea83e103c16cf1c6974f16844f5e /doc | |
| parent | b4b91864bb3879587edc7e8c430337f24835b28c (diff) | |
| parent | 48578e1512f2d5fa95e4fdde0564d2db8ee7f995 (diff) | |
| download | tor-dfc32177d9ec3b8a639d6831ca4bc92c4f273dcb.tar.gz tor-dfc32177d9ec3b8a639d6831ca4bc92c4f273dcb.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a42d5502c4..1cc8f841ce 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -42,7 +42,7 @@ COMMAND-LINE OPTIONS [[opt-f]] **-f** __FILE__:: Specify a new configuration file to contain further Tor configuration - options. (Default: $HOME/.torrc, or @CONFDIR@/torrc if that file is not + options. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) [[opt-allow-missing-torrc]] **--allow-missing-torrc**:: @@ -2252,6 +2252,9 @@ FILES **@CONFDIR@/torrc**:: The configuration file, which contains "option value" pairs. +**$HOME/.torrc**:: + Fallback location for torrc, if @CONFDIR@/torrc is not found. + **@LOCALSTATEDIR@/lib/tor/**:: The tor process stores keys and other data here. |