]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1829/head' into maint-0.4.3
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 16:56:39 +0000 (12:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 16:56:39 +0000 (12:56 -0400)
1  2 
src/app/config/config.c
src/test/test_config.c

Simple merge
Simple merge