[tor-commits] [tor/release-0.3.2] Merge branch 'bug24050_029_squashed' into maint-0.3.2

[nickm at torproject.org]

commit 9b44bb49b41631abc7933b3009821782f20db3c2
Merge: ef5461044 a94c48610
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 29 12:02:07 2017 -0500

    Merge branch 'bug24050_029_squashed' into maint-0.3.2

 changes/bug24050 | 5 +++++
 src/or/config.c  | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index a33812a4c,c48070b58..d8f71a019
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -6421,10 -6164,8 +6421,9 @@@ port_cfg_new(size_t namelen
    tor_assert(namelen <= SIZE_T_CEILING - sizeof(port_cfg_t) - 1);
    port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t) + namelen + 1);
    cfg->entry_cfg.ipv4_traffic = 1;
 +  cfg->entry_cfg.ipv6_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;
  }
@@@ -6738,9 -6516,9 +6737,9 @@@ parse_port_config(smartlist_t *out
      /* This must be kept in sync with port_cfg_new's defaults */
      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, dns_request = 1,
 +      ipv4_traffic = 1, ipv6_traffic = 1, 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,