Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2

This commit is contained in:
Nick Mathewson 2011-03-03 13:50:17 -05:00
commit 1d6af67ab8

View File

@ -34,7 +34,7 @@ OPTIONS
Display a short help message and exit.
**-f** __FILE__::
FILE contains further "option value" paris. (Default: @CONFDIR@/torrc)
FILE contains further "option value" pairs. (Default: @CONFDIR@/torrc)
**--hash-password**::
Generates a hashed password for control port access.