]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1065' into maint-0.4.1
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 11 Jun 2019 10:48:10 +0000 (13:48 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 11 Jun 2019 10:48:10 +0000 (13:48 +0300)
1  2 
src/app/config/config.c
src/test/test_config.c

Simple merge
Simple merge