Merge pull request #8141 from rgacogne/dnsdist-ocsp

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

Fri, 9 Aug 2019 08:20:04 +0000 (10:20 +0200)

committer GitHub <noreply@github.com>

Fri, 9 Aug 2019 08:20:04 +0000 (10:20 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 9 Aug 2019 08:20:04 +0000 (10:20 +0200)
committer GitHub <noreply@github.com>
Fri, 9 Aug 2019 08:20:04 +0000 (10:20 +0200)
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdistdist/doh.cc
Simple merge
diff --cc pdns/doh.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 9 Aug 2019 08:20:04 +0000 (10:20 +0200)
committer	GitHub <noreply@github.com>
	Fri, 9 Aug 2019 08:20:04 +0000 (10:20 +0200)
		1	2
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/doh.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/doh.hh	patch \|	diff1 \|	diff2 \|	blob \| history