From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 2 Apr 2014 01:00:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.4-alpha~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfc32177d9ec3b8a639d6831ca4bc92c4f273dcb;p=thirdparty%2Ftor.git

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

dfc32177d9ec3b8a639d6831ca4bc92c4f273dcb
diff --cc doc/tor.1.txt
index a42d5502c4,eb9ad6770a..1cc8f841ce
--- a/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