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

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

Conflicts:
	src/or/eventdns.c
---

285cf998bcb5b228d82e7ff2aa13a532eee837a9
diff --cc src/or/eventdns.c
index 725b59a19e,4753429b1f..0a0fef43f3
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@@ -2291,7 -2291,7 +2291,7 @@@ _evdns_nameserver_add_impl(const struc
  
  	evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
  
- 	ns->socket = tor_open_socket(PF_INET, SOCK_DGRAM, 0);
 -	ns->socket = socket(address->sa_family, SOCK_DGRAM, 0);
++	ns->socket = tor_open_socket(address->sa_family, SOCK_DGRAM, 0);
  	if (ns->socket < 0) { err = 1; goto out1; }
  #ifdef WIN32
  	{