[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8185_diagnostic' into maint-0.2.4

[nickm at torproject.org]

commit 922ab0883d2f037d18cfc02083c68777e4dfb349
Merge: ee3cc44 7d1ade2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 11 01:46:28 2013 -0400

    Merge remote-tracking branch 'public/bug8185_diagnostic' into maint-0.2.4

 changes/bug8185_diagnostic |    3 +++
 src/or/relay.c             |   22 +++++++++++++++-------
 src/or/relay.h             |   10 ++++++++--
 3 files changed, 26 insertions(+), 9 deletions(-)