commit c359c3056b2dbf17987a8955af30884ee438108e Merge: 59bbf8cde9 9ca2394d6b Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 24 12:25:05 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/ticket40345 | 5 +++++ src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)