]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug29875_035' into bug29875_master
authorNick Mathewson <nickm@torproject.org>
Fri, 31 May 2019 16:40:43 +0000 (12:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 31 May 2019 16:40:43 +0000 (12:40 -0400)
1  2 
src/app/config/config.c
src/feature/client/entrynodes.c

Simple merge
Simple merge