[tor-commits] [tor/main] Merge branch 'tor-gitlab/mr/228'

[dgoulet at torproject.org]

commit e4e88c4b2e44303c54cec6fc8a732c2329417ab4
Merge: 1873d4c14c bd68668ac0
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Oct 4 14:59:04 2021 -0400

    Merge branch 'tor-gitlab/mr/228'

 changes/ticket40182   |  4 ++++
 src/core/or/channel.c | 54 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 40 insertions(+), 18 deletions(-)