]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'feature13864_squashed'
authorNick Mathewson <nickm@torproject.org>
Mon, 2 Feb 2015 18:32:53 +0000 (13:32 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 2 Feb 2015 18:32:53 +0000 (13:32 -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