]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug27893'
authorNick Mathewson <nickm@torproject.org>
Mon, 1 Oct 2018 17:12:33 +0000 (12:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 1 Oct 2018 17:12:33 +0000 (12:12 -0500)
1  2 
src/app/config/config.c

Simple merge