nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-03 00:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9'

Browse Source
This commit is contained in:
Nick Mathewson 2016-10-26 14:17:21 -04:00
commit 5a1779b7ff
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug19869 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (DNSPort):
- On DNSPort, stop logging a BUG warning on a failed hostname lookup.
Fixes bug 19869; bugfix on 0.2.9.1-alpha.

4
src/or/dnsserv.c
View File

@ -302,6 +302,10 @@ evdns_get_orig_address(const struct evdns_server_request *req,
case RESOLVED_TYPE_IPV6: case RESOLVED_TYPE_IPV6:
type = EVDNS_TYPE_AAAA; type = EVDNS_TYPE_AAAA;
break; break;
case RESOLVED_TYPE_ERROR:
case RESOLVED_TYPE_ERROR_TRANSIENT:
/* Addr doesn't matter, since we're not sending it back in the reply.*/
return addr;
default: default:
tor_fragile_assert(); tor_fragile_assert();
return addr; return addr;