aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-03-19 01:52:18 +0000
committerRoger Dingledine <arma@torproject.org>2006-03-19 01:52:18 +0000
commit2c33218fc9a526cc29403fa35f4bb5ce93943e52 (patch)
treeb975b07f914308b1f4adb850d13f2ac4bc61108f /doc
parentd8195e41286c61fcf0b75ad86804f05932d77b8a (diff)
downloadtor-2c33218fc9a526cc29403fa35f4bb5ce93943e52.tar
tor-2c33218fc9a526cc29403fa35f4bb5ce93943e52.tar.gz
man page entry for safesocks. also correct the man page
entry for testsocks. svn:r6191
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.in13
1 files changed, 11 insertions, 2 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 0c153ef04..04bb3fa1a 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -406,11 +406,20 @@ as long-term entries for our circuits.
(Defaults to 3.)
.LP
.TP
+\fBSafeSocks \fR\fI0|1\fP
+When this option is enabled, Tor will reject application connections that
+use unsafe variants of the socks protocol -- ones that only provide an
+IP address, meaning the application is doing a DNS resolve first.
+Specifically, these are socks4 and socks5 when not doing remote DNS.
+(Defaults to 0.)
+.LP
+.TP
\fBTestSocks \fR\fB0\fR|\fB1\fR\fP
When this option is enabled, Tor will make a notice-level log entry for
each connection to the Socks port indicating whether the request used
-a hostname (safe) or an IP address (unsafe). This helps to determine
-whether an application using Tor is possibly leaking DNS requests.
+a safe socks protocol or an unsafe one (see above entry on SafeSocks).
+This helps to determine whether an application using Tor is possibly
+leaking DNS requests.
(Default: 0)
.SH SERVER OPTIONS