commit dfc32177d9ec3b8a639d6831ca4bc92c4f273dcb Merge: b4b9186 48578e1 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 1 21:00:30 2014 -0400

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

changes/bug9213_doc | 5 +++++ doc/tor.1.txt | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)

diff --cc doc/tor.1.txt index a42d550,eb9ad67..1cc8f84 --- 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