Merge branch 'xfr-tsig' into update-with-branches/poisonlicious

diff --cc configure
Simple merge

diff --cc daemon/remote.c
Simple merge

diff --cc daemon/worker.c
Simple merge

diff --cc services/mesh.c
Simple merge

diff --cc testcode/fake_event.c
Simple merge

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