Merge remote branch 'sebastian/bug1238'
commit6dd71d314dfe361aab52628e54f3aa9666c115e4
authorNick Mathewson <nickm@torproject.org>
Tue, 9 Feb 2010 17:50:45 +0000 (9 12:50 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 9 Feb 2010 17:50:45 +0000 (9 12:50 -0500)
tree46c87a574bfb25c40765594eaf99be57dddf17cc
parentd784eecad9c2d25ff45b86e43a623b73c259b86f
parent253fd21ae1cbf66efe0eedc4eee26f8c712d2804
Merge remote branch 'sebastian/bug1238'
src/or/connection_edge.c