- Merge PR #605: Fix EDNS to upstream where the same option could be
  attached more than once.

* nlnet/master:
  Changelog note for NLnetLabs#612: - Merge PR NLnetLabs#612: TCP race condition.
  - Fix NLnetLabs#588: Unbound 1.13.2 crashes due to p->pc is NULL in   serviced_udp_callback.
  - Better bookkeeping when reclaiming the TCP buffer.
  - Mark waiting_tcp and serviced_query as being in the   cb_and_decommission stage to signal later code about their state;   prevents premature item deletion.
  Changelog note for NLnetLabs#610 - Fix NLnetLabs#610: Undefine-shift in sldns_str2wire_hip_buf.
  - Fix NLnetLabs#610: Undefine-shift in sldns_str2wire_hip_buf.
  - Add serviced_query timer to send upstream queries outside of the mesh   flow to prevent race conditions.
  - For dnstap, do not wakeupnow right there. Instead zero the timer to   force the wakeup callback asap.
  - For NLnetLabs#602: Allow the module-config "subnetcache validator cachedb   iterator".
  - Add rpz: for-downstream: yesno option, where the RPZ zone is   authoritatively answered for, so the RPZ zone contents can be   checked with DNS queries directed at the RPZ zone.
  Changelog note for NLnetLabs#605: - Merge PR NLnetLabs#605: Fix EDNS to upstream where the same option could be   attached more than once.
  - Make sure callback changes for EDNS are not lost.
  - Fix EDNS to upstream where the same option could be attached more than   once. - Add a region to serviced_query for allocations.

  so that it is not state dependent, after the state fix of #605 for
  double EDNS options.

* nlnet/master: (27 commits)
  Changelog note for NLnetLabs#644, move commands together for library binary.
  Make `install-lib` make target install the pkg-config file.
  - Fix configure for python to use sysutils, because distutils is   deprecated. It uses sysutils when available, distutils otherwise.
  - Fix for NLnetLabs#637: fix integer overflow checks in sldns_str2period.
  - Fix NLnetLabs#637: Integer Overflow in sldns_str2period function.
  - Fix compile warnings for printf ll format on mingw compile.
  - Various fixes for NLnetLabs#632: variable initialisation, convert the qinfo   to str once, accept trailing dot in the local-zone ipset option.
  Changelog entry for NLnetLabs#632 - Merge PR NLnetLabs#632 from scottrw93: Match cnames in ipset.
  - Added tests for ipset.
  - Fix pythonmod for change in iter_dp_is_useless function prototype.
  - Fix for edns client subnet option add fix in removal code, from review.
  - Fix edns client subnet to add the option based on the option list,   so that it is not state dependent, after the state fix of NLnetLabs#605 for   double EDNS options.
  Changelog entry for NLnetLabs#623: - Merge NLnetLabs#623 from rex4539: Fix typos.
  - Fix NLnetLabs#630: Unify the RPZ log messages.
  - Fix for NLnetLabs#633: updated fix with new text.
  - Fix NLnetLabs#633: Document unix domain socket support for unbound-control.
  - Fix check interface existence for support detection in remote lookup.
  - update Makefile dependencies.
  - Fix to detect that no IPv6 support means that IPv6 addresses are   useless for delegation point lookups.
  Match cnames in ipset
  ...