aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-08-09 18:48:08 -0700
committerNick Mathewson <nickm@torproject.org>2009-08-09 18:48:08 -0700
commit4311b9a6d1d1af293583602f73b195ac3c91d2bc (patch)
treec23de2df87c71aa0ebf871f06a8f0245a1676285 /doc
parent8f8877c624f0ca575a366b540f85522be58c6062 (diff)
parent07d95440ef3430f74dfe0fa68f7d84eec9a17f3e (diff)
downloadtor-4311b9a6d1d1af293583602f73b195ac3c91d2bc.tar
tor-4311b9a6d1d1af293583602f73b195ac3c91d2bc.tar.gz
Merge commit 'arma/dotexit'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.in7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index f67393394..a49a26d47 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -692,6 +692,13 @@ resolved. This helps trap accidental attempts to resolve URLs and so on.
(Default: 0)
.LP
.TP
+\fBAllowDotExit \fR\fB0\fR|\fB1\fR\fP
+If enabled, we convert "www.google.com.foo.exit" addresses on the
+SocksPort/TransPort/NatdPort into "www.google.com" addresses that exit
+from the node "foo". Disabled by default since attacking websites and
+exit relays can use it to manipulate your path selection. (Default: 0)
+.LP
+.TP
\fBFastFirstHopPK \fR\fB0\fR|\fB1\fR\fP
When this option is disabled, Tor uses the public key step for the first
hop of creating circuits. Skipping it is generally safe since we have