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

[nickm at seul.org]

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

Modified:
   tor/trunk/
   tor/trunk/src/or/dns.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:6995
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:6997
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950

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