commit d235e523d5283591c0d44c934f1e04eafe09b19a
Merge: a692b87f8 393bbd823
Author: Nick Mathewson <[email protected]>
Date: Mon Jun 29 13:57:13 2020 -0400
Merge branch 'ticket33290_v2_042' into maint-0.4.2
changes/ticket33290 | 4 ++++
src/core/or/circuitmux.c | 8 ++++++--
src/core/or/circuitmux_ewma.c | 12 +++++++++---
3 files changed, 19 insertions(+), 5 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
