summaryrefslogtreecommitdiff
path: root/src/or/dnsserv.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-04 14:47:13 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-04 14:47:13 -0400
commite24c9022722119f4d0d631c7e4d02e347b9dc83d (patch)
tree167b657caec307fd67ad5219a7514f786232420c /src/or/dnsserv.c
parent230a3d1400939eddf17c3df26e398104a38f5fb1 (diff)
parent31332a878db0d8f8d53fe4e535ec9ae812675315 (diff)
downloadtor-e24c9022722119f4d0d631c7e4d02e347b9dc83d.tar.gz
tor-e24c9022722119f4d0d631c7e4d02e347b9dc83d.zip
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/or/dnsserv.c')
-rw-r--r--src/or/dnsserv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 3b48d80f87..edca50f6f9 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -88,8 +88,6 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
for (i = 0; i < req->nquestions; ++i) {
if (req->questions[i]->dns_question_class != EVDNS_CLASS_INET)
continue;
- if (! q)
- q = req->questions[i];
switch (req->questions[i]->type) {
case EVDNS_TYPE_A:
case EVDNS_TYPE_AAAA:
@@ -97,7 +95,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
/* We always pick the first one of these questions, if there is
one. */
if (! supported_q)
- supported_q = q;
+ supported_q = req->questions[i];
break;
default:
break;