Merge remote-tracking branch 'public/bug13811_025'

changes/bug13811

@@ -0,0 +1,6 @@
+  o Major bugfixes (client, automap):
+    - Repair automapping with IPv6 addresses; this automapping should
+      have worked previously, but one piece of debugging code that we
+      inserted to detect a regression actually caused the regression
+      to manifest itself again. Fixes bug 13811; bugfix on
+      0.2.4.7-alpha. Diagnosed and fixed by Francisco Blas Izquierdo Riera.

src/or/addressmap.c

@@ -888,7 +888,7 @@ addressmap_get_virtual_address(int type)
         /* XXXX This code is to make sure I didn't add an undecorated version
          * by mistake. I hope it's needless. */
         char tmp[TOR_ADDR_BUF_LEN];
-        tor_addr_to_str(buf, &addr, sizeof(tmp), 0);
+        tor_addr_to_str(tmp, &addr, sizeof(tmp), 0);
         if (strmap_get(addressmap, tmp)) {
           log_warn(LD_BUG, "%s wasn't in the addressmap, but %s was.",
                    buf, tmp);