]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/318'
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Sep 2018 12:12:19 +0000 (08:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Sep 2018 12:12:19 +0000 (08:12 -0400)
1  2 
src/app/config/config.c
src/test/test_util.c

Simple merge
Simple merge