]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1449'
authorteor <teor@torproject.org>
Wed, 23 Oct 2019 12:59:16 +0000 (22:59 +1000)
committerteor <teor@torproject.org>
Wed, 23 Oct 2019 12:59:16 +0000 (22:59 +1000)
1  2 
src/app/config/config.c

Simple merge