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

[nickm at torproject.org]

commit 25f9ecf4b203ed6a524b1d78ff2e38a2d0583d88
Merge: 55817c4 3367a76
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 5 16:58:26 2013 -0400

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

 changes/bug8596          |    3 +++
 src/or/addressmap.c      |    2 +-
 src/or/connection_edge.c |   21 +++++++++------------
 src/or/control.c         |   14 ++++++++------
 src/or/control.h         |    3 ++-
 5 files changed, 23 insertions(+), 20 deletions(-)