]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commit09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57
tree09125cf5f4fb3e20709d6c39f78e419791db67d7
parent0b3166fffa0e5e19c63fd95538f87d634444d28c
parentcd42ae71850985ed8dd34ae73dc6265a643fcb13
Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
doc/tor.1.txt
src/or/config.c
src/or/or.h