]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1034'
authorDavid Goulet <dgoulet@torproject.org>
Thu, 23 May 2019 13:40:07 +0000 (09:40 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 23 May 2019 13:40:07 +0000 (09:40 -0400)
1  2 
src/feature/relay/dns.c

Simple merge