[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

[arma@xxxxxxxxxxxxxx]

commit c3199495503930e33e7370d6c364b2b8b35844f4
Merge: a5232e0 ee72557
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat May 28 02:08:39 2011 -0400

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

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

diff --cc src/or/eventdns.c
index b7cc292,1d93ae0..4753429
--- 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
  	{



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