commit e35eb9baaace383a88a6fa4fbd5114153ff8d6f1 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 29 09:27:28 2018 -0400

Mark controller-initiated DNS lookups as permitted to do DNS.

Fixes bug 25617; bugfix on 0.2.9.3-alpha. --- changes/bug25617 | 5 +++++ src/or/dnsserv.c | 1 + 2 files changed, 6 insertions(+)

diff --git a/changes/bug25617 b/changes/bug25617 new file mode 100644 index 000000000..5de655d69 --- /dev/null +++ b/changes/bug25617 @@ -0,0 +1,5 @@ + o Minor bugfixes (controller): + - Restore the correct operation of the RESOLVE command, which had + been broken since we added the ability to enable/disable DNS + on specific listener ports. Fixes bug 25617; bugfix on 0.2.9.3-alpha. + diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index f5a4f2ac0..6f72fa419 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -196,6 +196,7 @@ dnsserv_launch_request(const char *name, int reverse,

/* Make a new dummy AP connection, and attach the request to it. */ entry_conn = entry_connection_new(CONN_TYPE_AP, AF_INET); + entry_conn->entry_cfg.dns_request = 1; conn = ENTRY_TO_EDGE_CONN(entry_conn); CONNECTION_AP_EXPECT_NONPENDING(entry_conn); conn->base_.state = AP_CONN_STATE_RESOLVE_WAIT;