nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/or/eventdns.c
This commit is contained in:
Nick Mathewson 2011-05-28 02:09:48 -04:00
commit 285cf998bc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes/bug2574 Normal file
View File

@ -0,0 +1,2 @@
o Minor features:
- Allow nameserves with IPv6 address. Fixes bug 2574.

2
src/or/eventdns.c
View File

@ -2291,7 +2291,7 @@ _evdns_nameserver_add_impl(const struct sockaddr *address,
evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns); evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
ns->socket = tor_open_socket(PF_INET, SOCK_DGRAM, 0); ns->socket = tor_open_socket(address->sa_family, SOCK_DGRAM, 0);
if (ns->socket < 0) { err = 1; goto out1; } if (ns->socket < 0) { err = 1; goto out1; }
#ifdef WIN32 #ifdef WIN32
{ {