[tor-commits] [tor/main] Merge branch 'tor-gitlab/mr/359'

[dgoulet at torproject.org]

commit 111e6e7f269c08e193efba8d45682bac93ead81e
Merge: c29ba98ce8 6028b2c10c
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu May 27 10:12:16 2021 -0400

    Merge branch 'tor-gitlab/mr/359'

 src/tools/tor-resolve.c | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)