From 9aafbfaefbfcaef713dddbf4e83807c282f07b88 Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Thu, 29 Nov 2012 01:04:56 +0000
Subject: [PATCH 1/2] regen master

---
 doc/arm/Bv9ARM.ch06.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index d25d2fce33..1115fe2ecd 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -1137,7 +1137,7 @@
    [ <span><strong class="command">channel</strong></span> <em class="replaceable"><code>channel_name</code></em> {
      ( <span><strong class="command">file</strong></span> <em class="replaceable"><code>path_name</code></em>
          [ <span><strong class="command">versions</strong></span> ( <em class="replaceable"><code>number</code></em> | <span><strong class="command">unlimited</strong></span> ) ]
-         [ <span><strong class="command">size</strong></span> <em class="replaceable"><code>size spec</code></em> ]
+         [ <span><strong class="command">size</strong></span> <em class="replaceable"><code>size_spec</code></em> ]
        | <span><strong class="command">syslog</strong></span> <em class="replaceable"><code>syslog_facility</code></em>
        | <span><strong class="command">stderr</strong></span>
        | <span><strong class="command">null</strong></span> );

From 2f21adbc6a0962117015a51a44b33a99f3f94ac7 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Wed, 28 Nov 2012 19:05:50 -0800
Subject: [PATCH 2/2] [master] fix dig +trace output

3427.	[bug]		dig +trace incorrectly displayed name server
			addresses instead of names. [RT #31641]
---
 CHANGES       | 3 +++
 bin/dig/dig.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index a580affe81..0544cca4b9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3427.	[bug]		dig +trace incorrectly displayed name server 
+			addresses instead of names. [RT #31641]
+
 3426.	[bug]		dnssec-checkds: Clearer output when records are not
 			found. [RT #31968]
 
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index fea96deb46..74263c9b0d 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -280,7 +280,7 @@ received(int bytes, isc_sockaddr_t *from, dig_query_t *query) {
 		       "from %s(%s) in %d ms\n\n",
 		       query->lookup->doing_xfr ?
 				query->byte_count : (isc_uint64_t)bytes,
-		       fromtext, query->servname,
+		       fromtext, query->userarg,
 		       (int)diff/1000);
 	}
 }