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

[nickm at torproject.org]

commit 096cbfb8b0712c227aee94bd9df47c6fdc92b193
Merge: 7824a65aa d67db64ce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 1 09:35:17 2019 -0400

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

 changes/ticket32196                 |   2 +
 src/core/or/circuitmux.c            |  56 +-----
 src/core/or/circuitmux.h            |  56 ++++++
 src/core/or/circuitmux_ewma.c       | 109 ----------
 src/core/or/circuitmux_ewma.h       | 107 +++++++++-
 src/core/or/destroy_cell_queue_st.h |   2 +
 src/test/fakecircs.c                |  88 ++++++++
 src/test/fakecircs.h                |  17 ++
 src/test/include.am                 |   3 +
 src/test/test.c                     |   1 +
 src/test/test.h                     |   1 +
 src/test/test_circuitmux.c          | 390 ++++++++++++++++++++++++++++++++++--
 src/test/test_circuitmux_ewma.c     | 228 +++++++++++++++++++++
 src/test/test_circuitpadding.c      |  81 ++------
 src/test/test_relay.c               |  38 +---
 15 files changed, 890 insertions(+), 289 deletions(-)