Merge remote-tracking branch 'origin/patches-2.0'

diff --cc test/regress_dns.c
index 155e0f5511d054db28b6cf57ba3539846110a6d8,b34fb96c9e1838d438c5fc77c3a7cf1b29ed148a..60f59956b10c07e02982e77c6289e52179604a11
--- 1/test/regress_dns.c
--- 2/test/regress_dns.c
+++ b/test/regress_dns.c
@@@ -1219,10 -1215,8 +1219,11 @@@ test_getaddrinfo_async(void *arg
        /* for localhost */
        evdns_base_load_hosts(dns_base, NULL);
  
 +      tt_assert(! evdns_base_set_option(dns_base, "timeout", "0.3"));
 +      tt_assert(! evdns_base_set_option(dns_base, "getaddrinfo-allow-skew", "0.2"));
 +
        memset(a_out, 0, sizeof(a_out));
+       memset(&local_outcome, 0, sizeof(local_outcome));
  
        n_gai_results_pending = 10000; /* don't think about exiting yet. */
  

diff --cc test/regress_http.c
Simple merge