commit c18d0b378c8230c7c2d05a0a555d54e162533794 Merge: 0343ec056e 5f5587ee50 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:29:31 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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