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

[nickm at torproject.org]

commit a324cd9020b3f088c90091f0b57292bd23072f2b
Merge: 267671bda 4449c9e8f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 06:01:02 2018 -0400

    Merge branch 'ticket25268_034_01'

 changes/ticket25268         |   7 +
 doc/tor.1.txt               |  18 +-
 src/or/channel.c            |  15 -
 src/or/channel.h            |   3 -
 src/or/channeltls.c         |   5 +-
 src/or/circuitlist.c        |   5 -
 src/or/circuitmux.c         | 678 ++------------------------------------------
 src/or/circuitmux_ewma.c    | 115 +++++---
 src/or/circuitmux_ewma.h    |   7 +-
 src/or/config.c             |  13 +-
 src/or/networkstatus.c      |  12 +-
 src/or/or.h                 |  17 --
 src/or/relay.c              |  25 --
 src/or/relay.h              |   1 -
 src/test/test_channel.c     |   5 +-
 src/test/test_circuitlist.c |   1 +
 src/test/test_circuitmux.c  |   2 +
 17 files changed, 125 insertions(+), 804 deletions(-)