Merge pull request #8967 from rgacogne/rec-dns64-prefix

author Remi Gacogne <remi.gacogne@powerdns.com>

Tue, 7 Apr 2020 09:37:58 +0000 (11:37 +0200)

committer GitHub <noreply@github.com>

Tue, 7 Apr 2020 09:37:58 +0000 (11:37 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Tue, 7 Apr 2020 09:37:58 +0000 (11:37 +0200)
committer GitHub <noreply@github.com>
Tue, 7 Apr 2020 09:37:58 +0000 (11:37 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/docs/settings.rst
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Tue, 7 Apr 2020 09:37:58 +0000 (11:37 +0200)
committer	GitHub <noreply@github.com>
	Tue, 7 Apr 2020 09:37:58 +0000 (11:37 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history