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

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-08-04 14:31:13 -0400 (Fri, 04 Aug 2006)
New Revision: 6979

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



Property changes on: tor/trunk
___________________________________________________________________
Name: svk:merge
   - 1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:7011
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
   + 1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:7014
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950

Modified: tor/trunk/src/or/eventdns.c
===================================================================
--- tor/trunk/src/or/eventdns.c	2006-08-04 18:27:10 UTC (rev 6978)
+++ tor/trunk/src/or/eventdns.c	2006-08-04 18:31:13 UTC (rev 6979)
@@ -1354,7 +1354,6 @@
 
 out2:
 	CLOSE_SOCKET(ns->socket);
-#endif
 out1:
 	free(ns);
 	log("Unable to add nameserver %s: error %d", debug_ntoa(address), err);