- Merge PR #355 from noloader: Make ICANN Update CA and DS Trust Anchor
  static data.

* nlnet/master: (34 commits)
  - Fix for doxygen 1.8.20 compatibility.
  - Fix fwd ancil test post script when not supported.
  - Fix empty clause warning in edns pass for padding.
  - Fix to use correct type for label count in ipdnametoaddr rpz routine.
  - Fix empty clause warning in config_file nsid parse.
  - Fix to use correct type for label count in rpz routine.
  - Annotate that we ignore the return value of if_indextoname.
  - Fix compile of unbound-dnstap-socket without dnstap installed.
  - Ignore cache blacklisting when trying to reply with expired data from   cache. (NLnetLabs#394)
  Changelog entry for: - Merge PR NLnetLabs#355 from noloader: Make ICANN Update CA and DS Trust Anchor   static data.
  Changelog entry for: - Merge PR NLnetLabs#275 by Roland van Rijswijk-Deij, Add feature to return the   original instead of a decrementing TTL ('serve-original-ttl').
  Changelog entry for: - Merge PR NLnetLabs#408 from fobser: Prevent a few more yacc clashes.
  - Update example.con.in and add a testcase for PR NLnetLabs#275.
  Some review nits from George
  Test some different padding sizes
  padding.tdir text in single TXT RR
  tdir test for padding option
  Addressed review comment from @wcawijngaards
  Changelog entry for padding option
  Move NSID Changelog entry to day of merge
  ...