Merge branch 'master' of https://github.com/NLnetLabs/unbound into restart_conf

diff --cc doc/unbound.conf.5.in
Simple merge

diff --cc iterator/iter_utils.c
index 637acf736d0ca3acac278fede1bce84540a489f7,f3bea46d6c95542a80e799e2c50edf00b27fd50d..5c811c6d3d2203aa13d62fb9e74e98125bd0ea37
--- 1/iterator/iter_utils.c
--- 2/iterator/iter_utils.c
+++ b/iterator/iter_utils.c
@@@ -176,9 -176,7 +176,9 @@@ iter_apply_cfg(struct iter_env* iter_en
        }
        iter_env->supports_ipv6 = cfg->do_ip6;
        iter_env->supports_ipv4 = cfg->do_ip4;
- 
 +      iter_env->max_query_restarts = cfg->max_query_restarts;
+       iter_env->outbound_msg_retry = cfg->outbound_msg_retry;
 +
        return 1;
  }
  

diff --cc iterator/iterator.c
Simple merge

diff --cc iterator/iterator.h
index d3ca716fca78ca5f369362659be67e2cbdae5ca0,8b840528d9d979592177fbc37171d7afb9064eb7..57d06ef8aa89f2270855042cfdcfe2d2954d807c
--- 1/iterator/iterator.h
--- 2/iterator/iterator.h
+++ b/iterator/iterator.h
@@@ -140,8 -138,8 +138,10 @@@ struct iter_env 
        /** number of queries that have been ratelimited */
        size_t num_queries_ratelimited;
  
 +      /** max number of query restarts to limit length of CNAME chain */
 +      size_t max_query_restarts;
+       /** number of retries on outgoing queries */
+       int outbound_msg_retry;
  };
  
  /**

diff --cc util/config_file.c
Simple merge

diff --cc util/config_file.h
Simple merge

diff --cc util/configlexer.lex
Simple merge

diff --cc util/configparser.y
Simple merge