diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-28 02:09:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-28 02:09:48 -0400 |
| commit | 285cf998bcb5b228d82e7ff2aa13a532eee837a9 (patch) | |
| tree | 7c9e46673f99194872591541a6844588b5a7fd32 /src/or/eventdns.c | |
| parent | 8e09f7cf107056f99e47029ccf9a9403ef45bc59 (diff) | |
| parent | c3199495503930e33e7370d6c364b2b8b35844f4 (diff) | |
| download | tor-285cf998bcb5b228d82e7ff2aa13a532eee837a9.tar.gz tor-285cf998bcb5b228d82e7ff2aa13a532eee837a9.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/eventdns.c
Diffstat (limited to 'src/or/eventdns.c')
| -rw-r--r-- | src/or/eventdns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 725b59a19e..0a0fef43f3 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -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 { |