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

[nickm at torproject.org]

commit 6276cca8ce15c442f9eb7a45649b6bb377daefc2
Merge: 1cc3bb3 59a162f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Dec 22 17:26:25 2013 -0500

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

 changes/bug10465         |    3 +++
 src/or/connection_edge.c |   46 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 8 deletions(-)