[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug5623'

[nickm at torproject.org]

commit f86bd1d5a4a5d71f7a529966341a37dbadd7a79f
Merge: 1cbde0b 526beb7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 15:25:21 2012 -0400

    Merge remote-tracking branch 'arma/bug5623'

 changes/bug5623          |    6 ++++++
 src/or/connection_edge.c |    8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)