Merge pull request #5 from NLnetLabs/master

author Ralph Dolmans <ralph@nlnetlabs.nl>

Thu, 25 Apr 2019 12:43:02 +0000 (14:43 +0200)

committer GitHub <noreply@github.com>

Thu, 25 Apr 2019 12:43:02 +0000 (14:43 +0200)
author Ralph Dolmans <ralph@nlnetlabs.nl>
Thu, 25 Apr 2019 12:43:02 +0000 (14:43 +0200)
committer GitHub <noreply@github.com>
Thu, 25 Apr 2019 12:43:02 +0000 (14:43 +0200)
diff --cc services/authzone.c
Simple merge
diff --cc services/authzone.h
Simple merge
author	Ralph Dolmans <ralph@nlnetlabs.nl>
	Thu, 25 Apr 2019 12:43:02 +0000 (14:43 +0200)
committer	GitHub <noreply@github.com>
	Thu, 25 Apr 2019 12:43:02 +0000 (14:43 +0200)
		1	2
services/authzone.c	patch \|	diff1 \|	diff2 \|	blob \| history
services/authzone.h	patch \|	diff1 \|	diff2 \|	blob \| history