summaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-18 15:07:02 -0400
committerNick Mathewson <nickm@torproject.org>2013-03-18 15:07:02 -0400
commit7e9b6a19d4cdc605039f4e0107cbd5f4781fe150 (patch)
tree1f17b58ff75b213c07b79ff7484ba523e320f710 /doc/tor.1.txt
parent26639b7798b5f5dae93e40bd7d050cb218a8aad2 (diff)
parent4740d2e8bcf72cc92bae72762ccae904015b9b2f (diff)
downloadtor-7e9b6a19d4cdc605039f4e0107cbd5f4781fe150.tar.gz
tor-7e9b6a19d4cdc605039f4e0107cbd5f4781fe150.zip
Merge remote-tracking branch 'public/bug8290' into maint-0.2.4
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 505a0834b5..b73d4a05dd 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2139,7 +2139,7 @@ __HiddenServiceDirectory__**/client_keys**::
SEE ALSO
--------
-**privoxy**(1), **tsocks**(1), **torify**(1) +
+**privoxy**(1), **torsocks**(1), **torify**(1) +
**https://www.torproject.org/**