diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-29 14:59:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-29 14:59:01 -0400 |
| commit | 2c1afc2defe4a86ebfe2ae205f201f6e85bf9dc7 (patch) | |
| tree | acd2c44433acbc48cab5ca25cc0a0315116fddbc | |
| parent | 5e8cf876e7fb6a742a8d188c4d29baaeab2f63fe (diff) | |
| parent | 4f473fadbd15ededac11feb76c064e49687c3d2b (diff) | |
| download | tor-2c1afc2defe4a86ebfe2ae205f201f6e85bf9dc7.tar.gz tor-2c1afc2defe4a86ebfe2ae205f201f6e85bf9dc7.zip | |
Merge branch 'maint-0.3.3'
| -rw-r--r-- | changes/bug25617 | 5 | ||||
| -rw-r--r-- | src/or/dnsserv.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug25617 b/changes/bug25617 new file mode 100644 index 0000000000..5de655d69e --- /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 9385561d99..7e344deeab 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -208,6 +208,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; |