diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-26 14:17:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-26 14:17:21 -0400 |
| commit | 5a1779b7ffa7445005dc271985bae43c6c761dc0 (patch) | |
| tree | 61f1f4c86882cad3d228fedfcac4caced2242a1e | |
| parent | 8a38d053a09615c8d9009571ba639bfcbd1d4fe2 (diff) | |
| parent | d28870402376c52b32feaebfcbe190873218fb89 (diff) | |
| download | tor-5a1779b7ffa7445005dc271985bae43c6c761dc0.tar.gz tor-5a1779b7ffa7445005dc271985bae43c6c761dc0.zip | |
Merge branch 'maint-0.2.9'
| -rw-r--r-- | changes/bug19869 | 4 | ||||
| -rw-r--r-- | src/or/dnsserv.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug19869 b/changes/bug19869 new file mode 100644 index 0000000000..430048f161 --- /dev/null +++ b/changes/bug19869 @@ -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. + diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 8dce832d47..c5c0a88b09 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -302,6 +302,10 @@ evdns_get_orig_address(const struct evdns_server_request *req, case RESOLVED_TYPE_IPV6: type = EVDNS_TYPE_AAAA; 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: tor_fragile_assert(); return addr; |