diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/TODO | 4 | ||||
| -rw-r--r-- | doc/tor.1.in | 9 |
2 files changed, 11 insertions, 2 deletions
@@ -87,9 +87,9 @@ d - Write limiting; separate token bucket for write - Write-limit directory responses (need to research) N - DNS improvements - - Option to deal with broken DNS of the "ggoogle.com? Ah, you meant + o Option to deal with broken DNS of the "ggoogle.com? Ah, you meant ads.me.com!" variety. -d - Autodetect whether DNS is broken in this way. + o Autodetect whether DNS is broken in this way. - Don't ask reject *:* nodes for DNS unless client wants you to. . Asynchronous DNS o Document and rename SearchDomains, ResolvConf options diff --git a/doc/tor.1.in b/doc/tor.1.in index a162137c6..d73f1436a 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -647,6 +647,15 @@ domain. For example, if this system is configured to believe it is in connected to "www.example.com". This option only effects name lookup for addresses requested by clients. (Defaults to "0".) +.LP +.TP +\fBServerDNSDetectHijacking \fR\fB0\fR|\fB1\fR\fP +When this option is set to 1, we will test periodically to determine whether +our local nameservers have been configured to hijack failing DNS requests +(usually to an advertising site). If they are, we will attempt to correct +this. This option only effects name lookup for addresses requested by +clients; and only takes effect if Tor was built with eventdns support. +(Defaults to "1".) .SH DIRECTORY SERVER OPTIONS .PP |