Merge remote-tracking branch 'origin/maint-0.2.2'
commit384e300cb4bc075f3b07e45017c9b5bcda050954
authorNick Mathewson <nickm@torproject.org>
Thu, 20 Oct 2011 03:16:08 +0000 (19 23:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 20 Oct 2011 03:16:08 +0000 (19 23:16 -0400)
tree544c0e704a537739ccabf5234dd9a2772bafb244
parent0a083b0188cacd2f07838ff0446113bd5211a024
parent5aa45ed6af87efaec5d6d4a32e8acbc733be8c3d
Merge remote-tracking branch 'origin/maint-0.2.2'
src/or/connection_edge.c