nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 13:06:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix documentation of torrc search order

Browse Source 
We are searching @CONFDIR@ before $HOME, but the documentation
implied otherwise.

I screwed this up in f5e86bcd6c, when I
first documented the $HOME/.torrc possibility.

Fix for bug 9213; bugfix on 0.2.3.18-rc.
This commit is contained in:
Nick Mathewson 2014-03-27 14:58:46 -04:00
parent a83abcf5ee
commit a68e6ea9c0
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug9213_doc Normal file
View File

@ -0,0 +1,5 @@
o Documentation:
- Correctly document that we search for a system torrc file before
looking in ~/.torrc. Fixes documentation side of 9213; bugfix
on 0.2.3.18-rc.

5
doc/tor.1.txt
View File

@ -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.