]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'feature_20956_029'
authorNick Mathewson <nickm@torproject.org>
Mon, 23 Jan 2017 21:07:15 +0000 (16:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 23 Jan 2017 21:07:15 +0000 (16:07 -0500)
1  2 
doc/tor.1.txt
src/or/config.c
src/or/confparse.c

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