Merge branch 'maint-0.3.3'

This commit is contained in:
Roger Dingledine 2018-05-08 13:49:56 -04:00
commit bf5eaa82da
2 changed files with 7 additions and 1 deletions

6
changes/bug26052 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (documentation):
- Stop saying in the manual that clients cache ipv4 dns answers
from exit relays. We haven't used them since 0.2.6.3-alpha, and
in ticket 24050 we stopped even caching them as of 0.3.2.6-alpha,
but we forgot to say so in the man page. Fixes bug 26052; bugfix
on 0.3.2.6-alpha.

View File

@ -1237,7 +1237,7 @@ The following options are useful only for clients (that is, if
flag is not supported.
**CacheIPv4DNS**;;
Tells the client to remember IPv4 DNS answers we receive from exit
nodes via this connection. (On by default.)
nodes via this connection.
**CacheIPv6DNS**;;
Tells the client to remember IPv6 DNS answers we receive from exit
nodes via this connection.