]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5
authorteor <teor@torproject.org>
Fri, 30 Aug 2019 13:22:18 +0000 (23:22 +1000)
committerteor <teor@torproject.org>
Fri, 30 Aug 2019 13:22:18 +0000 (23:22 +1000)
1  2 
src/feature/client/entrynodes.c

Simple merge