diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-01 20:59:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-01 20:59:13 -0400 |
| commit | 48578e1512f2d5fa95e4fdde0564d2db8ee7f995 (patch) | |
| tree | f21db11db33851aca8442f49ad65f62ad269260a /doc | |
| parent | 24e0b1088acd94ceae3109107fa354b89309e2b7 (diff) | |
| parent | a68e6ea9c0288d82ea10076c551f48d63b3813fc (diff) | |
| download | tor-48578e1512f2d5fa95e4fdde0564d2db8ee7f995.tar tor-48578e1512f2d5fa95e4fdde0564d2db8ee7f995.tar.gz | |
Merge branch 'bug9213_doc_024' into 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 3f8f6da03..eb9ad6770 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -37,7 +37,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-defaults-torrc]] **--defaults-torrc** __FILE__:: @@ -2103,6 +2103,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. |