commit c40b729c85ff45501523cbcd37f603aceeea4774 Merge: ea781dc44f c359c3056b Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 24 12:25:05 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

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