[tor-commits] [tor/master] Merge remote-tracking branch 'mikeperry/bug23114_squashed2'

[nickm at torproject.org]

commit 0340c02975a51410525507b92ee0b7f9e6e9d6f7
Merge: b189c613b 050bb6797
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 8 17:50:34 2017 -0500

    Merge remote-tracking branch 'mikeperry/bug23114_squashed2'

 changes/bug23100             |   7 ++
 changes/bug23114             |   6 ++
 src/or/circuitbuild.c        |  59 +++++--------
 src/or/circuitbuild.h        |   2 +-
 src/or/circuitlist.c         |  77 +++++++++++++++++
 src/or/circuitlist.h         |   5 ++
 src/or/circuitstats.c        | 195 +++++++++++++++++++++++++++++++++++++++++-
 src/or/circuitstats.h        |  12 +++
 src/or/circuituse.c          |  59 ++++++-------
 src/test/Makefile.nmake      |   1 +
 src/test/include.am          |   1 +
 src/test/test.c              |   1 +
 src/test/test.h              |   1 +
 src/test/test_circuitstats.c | 199 +++++++++++++++++++++++++++++++++++++++++++
 14 files changed, 549 insertions(+), 76 deletions(-)