altogether) before giving up on attaching EDE options.

…s when
  there isn't enough space.
- For #911: Try to trim EXTRA-TEXT (and LDNS_EDE_OTHER options
  altogether) before giving up on attaching EDE options.

* nlnet/master: (52 commits)
  - Move a cache reply callback in worker.c closer to the cache reply   generation.
  - Fix to use the now cached EDE, if any, for CD_bit queries.
  - More braces and formatting for Fix for EDNS EDE size calculation to   avoid future bugs.
  - Fix for EDNS EDE size calculation.
  - For NLnetLabs#911: Try to trim EXTRA-TEXT (and LDNS_EDE_OTHER options   altogether) before giving up on attaching EDE options.
  - iana portlist update.
  - Merge NLnetLabs#790 from Tom Carpay: Add support for EDE caching in cachedb   and subnetcache.
  - For NLnetLabs#790: Update formatting in cachedb/cachedb.c
  - For NLnetLabs#790: clean testcase.
  - For NLnetLabs#759: fix doc string.
  - Fix unused variable compile warning for kernel timestamps in   netevent.c
  - Review for NLnetLabs#790: Fix memory leak.
  - Review for NLnetLabs#790: Address Wouter's comments.
  - Review for NLnetLabs#790: replace tdir tests with simpler rpl tests.
  Address review comments for NLnetLabs#759: - Clear error text when an expected signature is missing.
  Address review comments for NLnetLabs#759: - Decrease allocations for "" EDE strings when loading the cachedump. - Check for existence of EDE code before attaching.
  - For NLnetLabs#889: Account for num_detached_states before possible   mesh_state_delete when erroring out.
  - For NLnetLabs#889: use netcat-openbsd instead of netcat-traditional.
  - Cleaner failure code for callback functions in interface.i.
  Log established connection to Redis
  ...