diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-03 13:50:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-03 13:50:17 -0500 |
| commit | 1d6af67ab8d96c30e022f1f7602276f10c8444dc (patch) | |
| tree | e77380483ade077fa4a66078859f8e7ee1ad59b3 | |
| parent | 6b7408178bf9cb3864cec14408d78e8374f26b68 (diff) | |
| parent | 88e0de9ebbb75a64d7870ccd8cf431bb0f23c937 (diff) | |
| download | tor-1d6af67ab8d96c30e022f1f7602276f10c8444dc.tar.gz tor-1d6af67ab8d96c30e022f1f7602276f10c8444dc.zip | |
Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2
| -rw-r--r-- | doc/tor.1.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8b8fd202bf..f1734d2016 100644 --- 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. |