]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Mon, 9 May 2011 17:37:56 +0000 (13:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 May 2011 17:37:56 +0000 (13:37 -0400)
1  2 
doc/tor.1.txt
src/or/config.c
src/or/or.h

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