]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug30721_squashed'
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Jun 2019 13:57:20 +0000 (09:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Jun 2019 13:57:20 +0000 (09:57 -0400)
1  2 
scripts/maint/practracker/exceptions.txt
src/lib/net/resolve.c

Simple merge