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 | 9a9d32fabc0899b50d1b06c37892b9eb556ee2cb (patch) | |
| tree | ec38ab8a1dd648b7e1e045a41542bf060403ad9e | |
| parent | fa726125402ffdd1084f46f82bf74aba162dbc2e (diff) | |
| parent | 9b44bb49b41631abc7933b3009821782f20db3c2 (diff) | |
| download | tor-9a9d32fabc0899b50d1b06c37892b9eb556ee2cb.tar.gz tor-9a9d32fabc0899b50d1b06c37892b9eb556ee2cb.zip | |
Merge branch 'maint-0.3.2' into release-0.3.2
| -rw-r--r-- | changes/bug24050 | 5 | ||||
| -rw-r--r-- | 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 0000000000..d184a77ac0 --- /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 a33812a4c7..d8f71a0193 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6424,7 +6424,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; } @@ -6740,7 +6739,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, |