[tor-commits] [tor/master] Merge branch 'bug12184_diagnostic_squashed'

[nickm at torproject.org]

commit a58d94fb7c6c304ecba930eaa7ebbade1d0686ab
Merge: cfca2a6 8f3e327
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 14 11:01:04 2014 -0400

    Merge branch 'bug12184_diagnostic_squashed'

 changes/bug12184_diagnostic |    4 +++
 src/or/circuitbuild.c       |   70 ++++++++++++++++++++++++++++++++++++++-----
 src/or/circuitlist.c        |   29 +++++++++++++++++-
 src/or/circuitlist.h        |    2 ++
 src/or/circuitmux.c         |   35 ++++++++++++++++++++++
 src/or/circuitmux.h         |    4 +++
 src/or/relay.c              |   11 +++++++
 src/or/relay.h              |    2 ++
 8 files changed, 149 insertions(+), 8 deletions(-)