]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'linus/bug9206_option'
authorNick Mathewson <nickm@torproject.org>
Wed, 16 Oct 2013 15:20:43 +0000 (11:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 16 Oct 2013 15:20:43 +0000 (11:20 -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