commit 08469a338ab524e233f357d46504338fd64dedf9 Merge: 5e9264671 03b4dd92a Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 21 10:50:06 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

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(-)