[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

[nickm at torproject.org]

commit f6af8e2021179498d3e964ea068f9b0aa8b8f8e4
Merge: 37b16d7e19 c359c3056b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 24 12:25:05 2021 -0400

    Merge branch 'maint-0.4.5'

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