commit 45b1c6bc8ba66a98608b5ebfaf22685a0623df31
Merge: 40faebd45 08469a338
Author: Nick Mathewson <[email protected]>
Date: Thu Dec 21 10:58:20 2017 -0500
Merge branch 'maint-0.3.1' into release-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(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
