Merge remote branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2011-02-22 18:25:16 -05:00
commit f16178c08f

View File

@ -330,7 +330,7 @@ Other options can be specified either on the command-line (--option
set of "logging domains". Each logging domain corresponds to an area of
functionality inside Tor. You can specify any number of severity ranges
for a single log statement, each of them prefixed by a comma-separated
list of logging domains. You can prefix a domain with ~ to indicate
list of logging domains. You can prefix a domain with $$~$$ to indicate
negation, and use * to indicate "all domains". If you specify a severity
range without a list of domains, it matches all domains. +
+