]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'feature15482_squashed'
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Sep 2015 18:03:04 +0000 (14:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Sep 2015 18:03:04 +0000 (14:03 -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