Merge pull request #367 from NLnetLabs/dnstap-log-local-addr

DNSTAP log local address

diff --cc daemon/worker.c
Simple merge

diff --cc services/listen_dnsport.c
Simple merge

diff --cc services/outside_network.c
Simple merge

diff --cc services/outside_network.h
Simple merge

diff --cc testcode/fake_event.c
Simple merge

diff --cc util/net_help.c
Simple merge

diff --cc util/netevent.c
Simple merge