]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1675'
authorDavid Goulet <dgoulet@torproject.org>
Mon, 20 Jan 2020 15:47:49 +0000 (10:47 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Mon, 20 Jan 2020 15:47:49 +0000 (10:47 -0500)
1  2 
doc/tor.1.txt
src/test/test_config.c

diff --cc doc/tor.1.txt
Simple merge
Simple merge