Merge pull request #7307 from pieterlexis/rec-lower-udp-trunc

author Remi Gacogne <rgacogne@users.noreply.github.com>

Tue, 8 Jan 2019 09:07:35 +0000 (10:07 +0100)

committer GitHub <noreply@github.com>

Tue, 8 Jan 2019 09:07:35 +0000 (10:07 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Tue, 8 Jan 2019 09:07:35 +0000 (10:07 +0100)
committer GitHub <noreply@github.com>
Tue, 8 Jan 2019 09:07:35 +0000 (10:07 +0100)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/docs/settings.rst
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Tue, 8 Jan 2019 09:07:35 +0000 (10:07 +0100)
committer	GitHub <noreply@github.com>
	Tue, 8 Jan 2019 09:07:35 +0000 (10:07 +0100)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history