commit 44df63e591feec5d5ae5c4a838664997bc64f489 Merge: a93f736337 9ca2394d6b Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 24 12:25:05 2021 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

changes/ticket40345 | 5 +++++ src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)