[tor-commits] [tor/master] Make the cache_ipv4_answers default become 0 again, for real.

[nickm at torproject.org]

commit a94c4861027015b4ca4c6a9512fc36512196fea4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 9 16:41:57 2017 -0500

    Make the cache_ipv4_answers default become 0 again, for real.
    
    Fortunately, use_cached_ipv4_answers was already 0, so we wouldn't
    actually use this info, but it's best not to have it.
    
    Fixes bug 24050; bugfix on 0.2.6.3-alpha
---
 changes/bug24050 | 5 +++++
 src/or/config.c  | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug24050 b/changes/bug24050
new file mode 100644
index 000000000..d184a77ac
--- /dev/null
+++ b/changes/bug24050
@@ -0,0 +1,5 @@
+  o Minor bugfixes (client):
+    - By default, do not enable storage of client-side DNS values.
+      These values were unused by default previously, but they should
+      not have been cached at all.  Fixes bug 24050; bugfix on
+      0.2.6.3-alpha.
diff --git a/src/or/config.c b/src/or/config.c
index 1aeff462e..c48070b58 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6166,7 +6166,6 @@ port_cfg_new(size_t namelen)
   cfg->entry_cfg.ipv4_traffic = 1;
   cfg->entry_cfg.dns_request = 1;
   cfg->entry_cfg.onion_traffic = 1;
-  cfg->entry_cfg.cache_ipv4_answers = 1;
   cfg->entry_cfg.prefer_ipv6_virtaddr = 1;
   return cfg;
 }
@@ -6519,7 +6518,7 @@ parse_port_config(smartlist_t *out,
       bind_ipv4_only = 0, bind_ipv6_only = 0,
       ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, dns_request = 1,
       onion_traffic = 1,
-      cache_ipv4 = 1, use_cached_ipv4 = 0,
+      cache_ipv4 = 0, use_cached_ipv4 = 0,
       cache_ipv6 = 0, use_cached_ipv6 = 0,
       prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0,
       relax_dirmode_check = 0,