tor

commit bf5eaa82da4214be681cf0674f24376b7c4c0e34
parent c3ae14549d48cf9266b6442cce3bb15df613a7a8
Author: Roger Dingledine <arma@torproject.org>
Date:   Tue,  8 May 2018 13:49:56 -0400

Merge branch 'maint-0.3.3'

Diffstat:
A
changes/bug26052
 | 
6
++++++
M
doc/tor.1.txt
 | 
2
+-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changes/bug26052 b/changes/bug26052
@@ -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.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
@@ -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.