mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts: src/or/eventdns.c
This commit is contained in:
commit
285cf998bc
2
changes/bug2574
Normal file
2
changes/bug2574
Normal file
@ -0,0 +1,2 @@
|
||||
o Minor features:
|
||||
- Allow nameserves with IPv6 address. Fixes bug 2574.
|
@ -2291,7 +2291,7 @@ _evdns_nameserver_add_impl(const struct sockaddr *address,
|
||||
|
||||
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; }
|
||||
#ifdef WIN32
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user