Merge remote branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2011-03-04 00:25:14 -05:00
commit c6d8e75dc3

View File

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