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

[nickm at torproject.org]

commit eb9b282cc24da6ff1e776ea02f94571e3e3f7017
Merge: e62b805 7f8098d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 27 21:07:36 2013 -0400

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

 changes/bug6572       |    4 ++++
 changes/bug8598       |    6 ++++++
 src/or/circuitbuild.c |    3 +++
 src/or/circuitstats.c |   10 +++++-----
 src/or/circuituse.c   |    2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)