[or-cvs] r6955: (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-07-31 14:00:47 -0400 (Mon, 31 Jul 2006)
New Revision: 6955

Modified:
   tor/trunk/
   tor/trunk/src/or/dns.c
Log:



Property changes on: tor/trunk
___________________________________________________________________
Name: svk:merge
   - c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:6959
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
   + c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:6976
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950

Modified: tor/trunk/src/or/dns.c
===================================================================
--- tor/trunk/src/or/dns.c	2006-07-31 18:00:18 UTC (rev 6954)
+++ tor/trunk/src/or/dns.c	2006-07-31 18:00:47 UTC (rev 6955)
@@ -295,9 +295,9 @@
     removed = HT_REMOVE(cache_map, &cache_root, resolve);
     if (removed != resolve) {
       log_err(LD_BUG, "The expired resolve we purged didn't match any in"
-              " the cache. Tried to purge %s; instead got %s.",
-              resolve->address, removed ? removed->address : "NULL");
-
+              " the cache. Tried to purge %s (%p); instead got %s (%p.",
+              resolve->address, resolve,
+              removed ? removed->address : "NULL", remove);
     }
     tor_assert(removed == resolve);
     resolve->magic = 0xF0BBF0BB;