[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm@xxxxxxxxxxxxxx]

commit 285cf998bcb5b228d82e7ff2aa13a532eee837a9
Merge: 8e09f7c c319949
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat May 28 02:09:48 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/eventdns.c

 changes/bug2574   |    2 ++
 src/or/eventdns.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --cc src/or/eventdns.c
index 725b59a,4753429..0a0fef4
--- 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
  	{

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits