Merge pull request #8945 from rgacogne/ddist-x-forwarded-for

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

Thu, 19 Mar 2020 10:45:10 +0000 (11:45 +0100)

committer GitHub <noreply@github.com>

Thu, 19 Mar 2020 10:45:10 +0000 (11:45 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Thu, 19 Mar 2020 10:45:10 +0000 (11:45 +0100)
committer GitHub <noreply@github.com>
Thu, 19 Mar 2020 10:45:10 +0000 (11:45 +0100)
diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge
diff --cc pdns/dnsdistdist/doh.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Thu, 19 Mar 2020 10:45:10 +0000 (11:45 +0100)
committer	GitHub <noreply@github.com>
	Thu, 19 Mar 2020 10:45:10 +0000 (11:45 +0100)
		1	2
pdns/dnsdistdist/docs/reference/config.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/doh.cc	patch \|	diff1 \|	diff2 \|	blob \| history