]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/ticket19704'
authorNick Mathewson <nickm@torproject.org>
Mon, 18 Sep 2017 19:02:16 +0000 (15:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 Sep 2017 19:02:16 +0000 (15:02 -0400)
1  2 
doc/tor.1.txt
src/or/config.c

diff --cc doc/tor.1.txt
Simple merge
diff --cc src/or/config.c
Simple merge