commit eb0c7ab43391673945e11a92c7f186620aa3a8fa Merge: ba0c0ef77 920208776 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 21 10:58:20 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

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