commit 1ee164afc2fcc449b562ab8899c458bcc877a4ba Merge: 5cd85feaa7 faa752f3c9 Author: David Goulet dgoulet@torproject.org Date: Wed Jul 22 16:14:11 2020 -0400

Merge branch 'tor-gitlab/mr/77' into maint-0.4.4

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