]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1772/head'
authorNick Mathewson <nickm@torproject.org>
Thu, 5 Mar 2020 14:09:16 +0000 (09:09 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 5 Mar 2020 14:09:16 +0000 (09:09 -0500)
1  2 
src/feature/relay/dns.c

Simple merge