Merge branch 'maint-0.4.8' into release-0.4.8

changes/ticket40908

changes/ticket40921

src/core/or/circuitbuild.c

src/core/or/conflux.c

src/core/or/conflux_util.c

src/core/or/relay.c

src/core/or/relay.h

src/feature/relay/circuitbuild_relay.c