This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

The following commit(s) were added to refs/heads/main by this push: new 1760a12f83 dns: Wake up a dormant tor with a DNSPort request new 17a8b3c735 Merge branch 'tor-gitlab/mr/547' 1760a12f83 is described below

commit 1760a12f8373d10a348ae5eb5bb4ad69406a34c3 Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Mar 15 12:12:57 2022 -0400

dns: Wake up a dormant tor with a DNSPort request

Fixes #40577

Signed-off-by: David Goulet dgoulet@torproject.org --- changes/ticket40577 | 3 +++ src/feature/client/dnsserv.c | 3 +++ 2 files changed, 6 insertions(+)

diff --git a/changes/ticket40577 b/changes/ticket40577 new file mode 100644 index 0000000000..305076942a --- /dev/null +++ b/changes/ticket40577 @@ -0,0 +1,3 @@ + o Minor bugfixes (DNSPort, dormant mode): + - A request on the DNSPort now wakes up a dormant tor. Fixes bug 40577; + bugfix on 0.3.5.1-alpha. diff --git a/src/feature/client/dnsserv.c b/src/feature/client/dnsserv.c index 67ab20eded..f0bb0af100 100644 --- a/src/feature/client/dnsserv.c +++ b/src/feature/client/dnsserv.c @@ -65,6 +65,9 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)

log_info(LD_APP, "Got a new DNS request!");

+ /* Receiving a request on the DNSPort counts as user activity. */ + note_user_activity(approx_time()); + req->flags |= 0x80; /* set RA */

/* First, check whether the requesting address matches our SOCKSPolicy. */