From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 28 May 2011 06:08:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.3.2-alpha~98^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3199495503930e33e7370d6c364b2b8b35844f4;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
---

c3199495503930e33e7370d6c364b2b8b35844f4
diff --cc src/or/eventdns.c
index b7cc2929ae,1d93ae048e..4753429b1f
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@@ -2288,10 -2318,9 +2288,10 @@@ _evdns_nameserver_add_impl(const struc
  	if (!ns) return -1;
  
  	memset(ns, 0, sizeof(struct nameserver));
 -	ns->timeout_event_deleted = __LINE__;
 +
 +	evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
  
- 	ns->socket = socket(PF_INET, SOCK_DGRAM, 0);
+ 	ns->socket = socket(address->sa_family, SOCK_DGRAM, 0);
  	if (ns->socket < 0) { err = 1; goto out1; }
  #ifdef WIN32
  	{