]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug3270' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Mon, 30 May 2011 18:49:49 +0000 (14:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 30 May 2011 18:49:49 +0000 (14:49 -0400)
commitda7c60dcf310fb9914bfd1b84a34b440ab04900a
tree1a30bd8ef9e3473a45a5c72c538afceae9233412
parent6802499413f8efd98ad4d578e5ef937cb55c1edc
parentcfeafe5e77c9dd5587b1ec553eb1065f0bf841fd
Merge remote-tracking branch 'public/bug3270' into maint-0.2.2
src/common/compat.h
src/common/util.c
src/or/connection.c
src/or/control.c
src/or/eventdns.c
src/or/main.c
src/or/or.h