commit 920208776052d2130557359a0a8077406c60dd21
Merge: 428f8a375 cd1f708a7
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Dec 21 10:40:10 2017 -0500
Merge branch 'bug24666_squashed_025' into maint-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(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
