commit 884ccd6996dcd713600e50ec11de0e9a6655607f Merge: 492625badf 1ee164afc2 Author: David Goulet dgoulet@torproject.org Date: Wed Jul 22 16:14:19 2020 -0400

Merge branch 'maint-0.4.4'

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