[tor-commits] [tor/release-0.2.3] Merge remote-tracking branch 'public/bug6211' into maint-0.2.3

[nickm at torproject.org]

commit ebda15e4b5fe4d2e154526befcc6b9ad8f635813
Merge: a9de982 c239c57
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 22 22:38:59 2012 -0400

    Merge remote-tracking branch 'public/bug6211' into maint-0.2.3

 changes/bug6211          |    4 ++++
 src/or/connection_edge.c |   17 ++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)