Merge branch 'master' into framestreams

author W.C.A. Wijngaards <wouter@nlnetlabs.nl>

Thu, 30 Jan 2020 15:22:12 +0000 (16:22 +0100)

committer W.C.A. Wijngaards <wouter@nlnetlabs.nl>

Thu, 30 Jan 2020 15:22:12 +0000 (16:22 +0100)
author W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Thu, 30 Jan 2020 15:22:12 +0000 (16:22 +0100)
committer W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Thu, 30 Jan 2020 15:22:12 +0000 (16:22 +0100)
diff --cc Makefile.in
Simple merge
diff --cc daemon/daemon.c
Simple merge
diff --cc daemon/worker.c
Simple merge
author	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Thu, 30 Jan 2020 15:22:12 +0000 (16:22 +0100)
committer	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Thu, 30 Jan 2020 15:22:12 +0000 (16:22 +0100)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/daemon.c	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/worker.c	patch \|	diff1 \|	diff2 \|	blob \| history