commit ba5a71b91325b52f27fff76b736af9ddd16ba540 Merge: fd5e9f4041 4046b9f3ee Author: David Goulet dgoulet@torproject.org Date: Fri Oct 8 10:43:53 2021 -0400

Merge branch 'tor-gitlab/mr/447'

changes/ticket34083 | 5 +++++ src/core/or/connection_edge.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-)