diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-07-09 09:59:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-07-09 09:59:54 -0400 |
| commit | be6b30e642eafc8ad9552e08ab117ac2a9900623 (patch) | |
| tree | 1f89f98450d4776056fb4e59982ff33b6ff44ac9 /src | |
| parent | b0399c60269647678b873f3ca47cabb3888bbd8f (diff) | |
| parent | 8dd89e433078245778924ce67403673e9d35a5c3 (diff) | |
| download | tor-be6b30e642eafc8ad9552e08ab117ac2a9900623.tar.gz tor-be6b30e642eafc8ad9552e08ab117ac2a9900623.zip | |
Merge branch 'maint-0.4.4'
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/config/config.c | 2 | ||||
| -rw-r--r-- | src/test/test_config.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 9d852e5408..fbba43a2b2 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -5611,7 +5611,7 @@ port_cfg_new(size_t namelen) /* entry_cfg flags */ cfg->entry_cfg.ipv4_traffic = 1; cfg->entry_cfg.ipv6_traffic = 1; - cfg->entry_cfg.prefer_ipv6 = 1; + cfg->entry_cfg.prefer_ipv6 = 0; cfg->entry_cfg.dns_request = 1; cfg->entry_cfg.onion_traffic = 1; cfg->entry_cfg.prefer_ipv6_virtaddr = 1; diff --git a/src/test/test_config.c b/src/test/test_config.c index 0862ba5c44..50e1a9dc43 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4402,8 +4402,6 @@ test_config_parse_port_config__ports__ports_given(void *data) /* Test entry port defaults as initialised in port_parse_config */ tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.prefer_ipv6, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 1); |