[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/352'

[nickm at torproject.org]

commit 50367d06f2ae1a06e6553a8925b5aded7f610082
Merge: 52191064a 8a83c4b61
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 18 08:44:58 2018 -0400

    Merge remote-tracking branch 'tor-github/pr/352'

 changes/bug23512             |   6 +++
 src/core/or/channeltls.h     |   2 +
 src/core/or/circuitlist.c    |  59 +++++++++++++++++++++++
 src/core/or/circuitlist.h    |   2 +
 src/core/or/or.h             |  12 +++++
 src/core/or/relay.c          |   1 +
 src/core/or/scheduler_kist.c |   2 -
 src/feature/stats/rephist.c  |  21 ++++----
 src/feature/stats/rephist.h  |  10 ++--
 src/test/test_relay.c        | 111 +++++++++++++++++++++++++++++++++++++++++--
 10 files changed, 207 insertions(+), 19 deletions(-)