Commit 4f473fad authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'bug25617_029' into maint-0.3.3

parents 2e9e91eb e35eb9ba

changes/bug25617

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/or/dnsserv.c

+1 −0
Original line number Diff line number Diff line
@@ -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;