[tor-commits] [tor/release-0.4.2] Merge branch 'ticket33290_v2_041' into ticket33290_v2_042

[nickm@xxxxxxxxxxxxxx]

commit 393bbd823ec32f8fb3636391945e6c6663ff1408
Merge: fd1686c7d c1649ab01
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Feb 14 08:16:01 2020 -0500

    Merge branch 'ticket33290_v2_041' into ticket33290_v2_042

 src/core/or/circuitmux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits