[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4

[dgoulet at torproject.org]

commit d1a8c10fc1ee962b8b54447dcb9b892d4683332b
Merge: 29279889ac 1ee164afc2
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Jul 22 16:14:19 2020 -0400

    Merge branch 'maint-0.4.4' into release-0.4.4

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