Merge remote-tracking branch 'valentecaio/t-24714'

diff --cc src/or/circuituse.c
Simple merge

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/hs_client.c
Simple merge

diff --cc src/or/main.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/or/relay.c
Simple merge

diff --cc src/or/rendclient.c
Simple merge