commit bfa8f3f93a71a4c547be5a4e92fa28bb6cd68c47 Merge: bef4760055 3e9fa5a029 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:29:31 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

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