Merge pull request #6045 from rgacogne/dnscrypt-xchacha20

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Thu, 22 Mar 2018 09:47:16 +0000 (10:47 +0100)

committer GitHub <noreply@github.com>

Thu, 22 Mar 2018 09:47:16 +0000 (10:47 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 22 Mar 2018 09:47:16 +0000 (10:47 +0100)
committer GitHub <noreply@github.com>
Thu, 22 Mar 2018 09:47:16 +0000 (10:47 +0100)
diff --cc pdns/dnsdist-lua-vars.cc
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Thu, 22 Mar 2018 09:47:16 +0000 (10:47 +0100)
committer	GitHub <noreply@github.com>
	Thu, 22 Mar 2018 09:47:16 +0000 (10:47 +0100)
		1	2
pdns/dnsdist-lua-vars.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history