Turn off by-default use of client-side DNS cacheing.

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index d6b51cb0d4bc5e3c8e557d66838925a133197d9e..5cf7ff7e3d288912cb673ea018f5b574f0a189d9 100644 (file)
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -946,7 +946,9 @@ The following options are useful only for clients (that is, if
         nodes via this connection.
     **UseIPv4Cache**;;
         Tells the client to use any cached IPv4 DNS answers we have when making
-        requests via this connection. (On by default.)
+        requests via this connection. (NOTE: This option, along UseIPv6Cache
+        and UseDNSCache, can harm your anonymity, and probably
+        won't help performance as much as you might expect. Use with care!)
     **UseIPv6Cache**;;
         Tells the client to use any cached IPv6 DNS answers we have when making
         requests via this connection.

diff --git a/src/or/config.c b/src/or/config.c
index 9f54d3da08acc5faafde8b30e6cd8b0def8b4436..04f512b804ee46c4705788a265c4350414a6b1d6 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4596,7 +4596,6 @@ port_cfg_new(void)
   port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t));
   cfg->ipv4_traffic = 1;
   cfg->cache_ipv4_answers = 1;
-  cfg->use_cached_ipv4_answers = 1;
   return cfg;
 }
 
@@ -4844,7 +4843,7 @@ parse_port_config(smartlist_t *out,
     int no_listen = 0, no_advertise = 0, all_addrs = 0,
       bind_ipv4_only = 0, bind_ipv6_only = 0,
       ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0,
-      cache_ipv4 = 1, use_cached_ipv4 = 1,
+      cache_ipv4 = 1, use_cached_ipv4 = 0,
       cache_ipv6 = 0, use_cached_ipv6 = 0;
 
     smartlist_split_string(elts, ports->value, NULL,