Merge pull request #8245 from Habbie/dns_random_testing

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Wed, 18 Sep 2019 16:51:12 +0000 (18:51 +0200)

committer GitHub <noreply@github.com>

Wed, 18 Sep 2019 16:51:12 +0000 (18:51 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Wed, 18 Sep 2019 16:51:12 +0000 (18:51 +0200)
committer GitHub <noreply@github.com>
Wed, 18 Sep 2019 16:51:12 +0000 (18:51 +0200)
diff --cc pdns/calidns.cc
Simple merge
diff --cc pdns/dns_random.cc
Simple merge
diff --cc pdns/dnspacket.cc
Simple merge
diff --cc pdns/dnsproxy.cc
Simple merge
diff --cc pdns/resolver.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Wed, 18 Sep 2019 16:51:12 +0000 (18:51 +0200)
committer	GitHub <noreply@github.com>
	Wed, 18 Sep 2019 16:51:12 +0000 (18:51 +0200)
		1	2
pdns/calidns.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dns_random.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnspacket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsproxy.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/resolver.cc	patch \|	diff1 \|	diff2 \|	blob \| history