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

[nickm at torproject.org]

commit bcf033047d80214b453327532910969b72b72c05
Merge: 1fe6e318f 03b4dd92a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 21 10:58:20 2017 -0500

    Merge branch 'maint-0.3.0' into release-0.3.0

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