[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug8387_diagnostic'

[nickm at torproject.org]

commit 0de2625675c9b504a40312ef190bf8b184cc9ce0
Merge: 2e1ac27 48b9c6f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 7 22:15:24 2014 -0400

    Merge remote-tracking branch 'public/bug8387_diagnostic'

 changes/diagnose_8387 |    4 ++++
 src/or/circuituse.c   |   58 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/or/circuituse.h   |    1 +
 src/or/status.c       |    3 +++
 4 files changed, 66 insertions(+)