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

1d6af67a · Nick Mathewson · 6b740817 · 88e0de9e · 1d6af67a
Commit 1d6af67a authored 14 years ago by Nick Mathewson
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -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.