commit f0007f2b8d3fe981fc627eee0facfe828142a1fa Merge: 9b44bb49b eb1976202 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 29 12:05:49 2017 -0500
Merge branch 'bug24050_029_squashed' into maint-0.3.2
src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --cc src/test/test_config.c index 1c0dab39c,88a0da981..e7380c1d1 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@@ -4003,9 -4118,9 +4003,9 @@@ test_config_parse_port_config__ports__p 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.onion_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, 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); -#endif +#endif /* defined(_WIN32) */
// Test failure if we have no ipv4 and no ipv6 and no onion (DNS only) config_free_lines(config_port_invalid); config_port_invalid = NULL;