[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm at torproject.org]

commit 89f40ba97a752f125ef7dbb057d64dd5e06a95db
Merge: 2e0c22d58 7d845976e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 21 10:58:20 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug24666           |  7 ++++
 src/or/circuitmux.c        | 34 +++++--------------
 src/or/circuitmux.h        |  2 +-
 src/or/or.h                | 15 +++++++++
 src/or/relay.c             | 82 ++++++++++++++++++++++++++++++++++++++++++++--
 src/or/relay.h             |  8 +++++
 src/test/test_circuitmux.c | 12 +++----
 7 files changed, 126 insertions(+), 34 deletions(-)