Merge branch 'bug9213_doc_024' into maint-0.2.4

changes/bug9213_doc

+  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

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