]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/ticket18319'
authorNick Mathewson <nickm@torproject.org>
Sat, 21 Jan 2017 19:44:00 +0000 (14:44 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 21 Jan 2017 19:44:00 +0000 (14:44 -0500)
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