]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.9' into maint-0.3.0
authorNick Mathewson <nickm@torproject.org>
Fri, 5 Jan 2018 21:41:34 +0000 (16:41 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 5 Jan 2018 21:41:34 +0000 (16:41 -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