]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug24050_029_squashed' into maint-0.3.2
authorNick Mathewson <nickm@torproject.org>
Wed, 29 Nov 2017 17:05:49 +0000 (12:05 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 29 Nov 2017 17:05:49 +0000 (12:05 -0500)
1  2 
src/test/test_config.c

index 1c0dab39ca0ece0f404d050aea4cb52f21809363,88a0da981ec9156730429ecc72fa099724bb73d4..e7380c1d144a756be3fd325b7dc12c2e87c11f78
@@@ -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;