mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 02:09:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson 2014-04-01 21:00:30 -04:00
commit dfc32177d9
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

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