diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-04 00:25:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-04 00:25:14 -0500 |
| commit | c6d8e75dc3aafe7b9a658221ac3bcd4a5936ff9b (patch) | |
| tree | 664fca0a32a9267a7f3b4f0aead8de5df050fdff /doc | |
| parent | f608872b0c62263c761157076129d8f4b07c20a9 (diff) | |
| parent | 1d6af67ab8d96c30e022f1f7602276f10c8444dc (diff) | |
| download | tor-c6d8e75dc3aafe7b9a658221ac3bcd4a5936ff9b.tar.gz tor-c6d8e75dc3aafe7b9a658221ac3bcd4a5936ff9b.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'doc')
| -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 8897141585..eaebf440ae 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. |