[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

[nickm at torproject.org]

commit 96746e39f6623d025e1ffae518761ecca4579168
Merge: d4a64fd 217862b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 28 10:57:23 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3'

 changes/bug6244_part2    |    4 ++++
 src/or/connection_edge.c |   13 +++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)