commit 0c91c63593720f07a20034bce2b0478dee216763 Merge: b119c5577 59133051f Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 13 10:10:57 2020 -0400

Merge branch 'ticket33919'

changes/ticket33919 | 3 +++ src/core/or/channel.c | 9 +------- src/core/or/channel.h | 5 ++++- src/test/test_channel.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 9 deletions(-)