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

diff --cc doc/tor.1.txt
index a42d5502c41fddc7a1d636208951e1f4091db578,eb9ad6770aa60e961def892c5c48a988a3c4bada..1cc8f841ce3d465efacfae62b9a6b2e4b313b6dc
--- 1/doc/tor.1.txt
--- 2/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -42,13 -37,9 +42,13 @@@ COMMAND-LINE OPTION
  
  [[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**::
 +    Do not require that configuration file specified by **-f** exist if
 +    default torrc can be accessed.
 +
  [[opt-defaults-torrc]] **--defaults-torrc** __FILE__::
      Specify a file in which to find default values for Tor options.  The
      contents of this file are overridden by those in the regular