Merge pull request #6117 from rgacogne/ddist-dns-over-tls

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

Fri, 12 Jan 2018 11:13:19 +0000 (12:13 +0100)

committer GitHub <noreply@github.com>

Fri, 12 Jan 2018 11:13:19 +0000 (12:13 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 12 Jan 2018 11:13:19 +0000 (12:13 +0100)
committer GitHub <noreply@github.com>
Fri, 12 Jan 2018 11:13:19 +0000 (12:13 +0100)
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist-tcp.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 12 Jan 2018 11:13:19 +0000 (12:13 +0100)
committer	GitHub <noreply@github.com>
	Fri, 12 Jan 2018 11:13:19 +0000 (12:13 +0100)
		1	2
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-tcp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history