[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5

[teor at torproject.org]

commit e5be039494745a3b0d101e422aa5793aaeac3567
Merge: f65f4b5c3 37aae2394
Author: teor <teor at torproject.org>
Date:   Mon Aug 12 09:50:42 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5

 changes/ticket29617     | 4 ++++
 src/feature/relay/dns.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)