[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3

[nickm@xxxxxxxxxxxxxx]

commit 3e9fa5a029af55a0175b106199a5371fd87c8e4a
Merge: 701a1936fa 5f5587ee50
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Oct 7 08:29:31 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket33880   |  6 ++++++
 src/core/or/channel.c | 32 +++++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)




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