Merge pull request #2641 from pieterlexis/issue-2576-count-TCP-queries

author Peter van Dijk <peter.van.dijk@netherlabs.nl>

Fri, 31 Jul 2015 20:23:37 +0000 (22:23 +0200)

committer Peter van Dijk <peter.van.dijk@netherlabs.nl>

Fri, 31 Jul 2015 20:23:37 +0000 (22:23 +0200)
author Peter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 31 Jul 2015 20:23:37 +0000 (22:23 +0200)
committer Peter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 31 Jul 2015 20:23:37 +0000 (22:23 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/tcpreceiver.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@netherlabs.nl>
	Fri, 31 Jul 2015 20:23:37 +0000 (22:23 +0200)
committer	Peter van Dijk <peter.van.dijk@netherlabs.nl>
	Fri, 31 Jul 2015 20:23:37 +0000 (22:23 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/tcpreceiver.cc	patch \|	diff1 \|	diff2 \|	blob \| history