diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-29 12:02:44 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-29 12:02:44 -0500 |
| commit | 6a9c3d6e3a719ed4e72327320a2f0d1d86e11f9c (patch) | |
| tree | 5622e9264802d17db4c4bd1054354751abf7a028 /src/or/config.c | |
| parent | b23086060866c1541a607e0e9082ef9d9464549e (diff) | |
| parent | 9b44bb49b41631abc7933b3009821782f20db3c2 (diff) | |
| download | tor-6a9c3d6e3a719ed4e72327320a2f0d1d86e11f9c.tar.gz tor-6a9c3d6e3a719ed4e72327320a2f0d1d86e11f9c.zip | |
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index d97ca8bf58..dabebdc226 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6498,7 +6498,6 @@ port_cfg_new(size_t namelen) 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; } @@ -6814,7 +6813,7 @@ parse_port_config(smartlist_t *out, bind_ipv4_only = 0, bind_ipv6_only = 0, 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, |