]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Fri, 6 May 2011 01:54:04 +0000 (21:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 6 May 2011 01:54:04 +0000 (21:54 -0400)
commit1065a5ef2987e910d10cfcc74eab35dcb4bbf74e
treeb4e245ae7d4906c8dc3433c6d4003f777e6e4326
parentad35b8f40d8701294b3b97faec3134ac1b8bb302
parent330116f0343e3b7b6632d3bd1b5c9f6bca87872d
Merge remote-tracking branch 'origin/maint-0.2.2'
src/common/compat.c
src/or/rendclient.c