commit bae6780e705e6a5d78e037b0d4e426b355d84ffe Merge: a5dc1a4c85 bcc953307b Author: Alexander Færøy ahf@torproject.org Date: Wed Oct 20 18:39:07 2021 +0000

Merge branch 'tor-gitlab/mr/464_squashed' into main

changes/bug40400_part3 | 7 +++++++ src/core/or/circuitlist.c | 7 +++++++ src/core/or/or_circuit_st.h | 5 ++++- src/core/or/relay.c | 13 +++++++++++-- src/core/or/status.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/core/or/status.h | 3 +++ 6 files changed, 75 insertions(+), 3 deletions(-)