Michal and I discussed this last week via jabber, and except that he
preferred grep/wc to awk in the test script, we agreed it was okay to
merge. It doesn't seem to have happened yet, though, so I'm going to merge
it so it can be in the alpha.

4712.	[bug]		"dig +domain" and "dig +search" didn't retain the
			search domain when retrying with TCP. [RT #45547]

9.12.0, 9.11.3, 9.10.7, 9.9.12