torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bug9213_doc_024' into maint-0.2.4

Browse Source
This commit is contained in:
Nick Mathewson
2014-04-01 20:59:13 -04:00
parent 24e0b1088a a68e6ea9c0
commit 48578e1512
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug9213_doc
+5
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.
doc/tor.1.txt
+4 -1
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.