commit ea781dc44fe9423af4197cfc1e07825d4366e491 Merge: aa49562a05 59bbf8cde9 Author: George Kadianakis <desnacked@riseup.net> Date: Wed Mar 17 13:43:47 2021 +0200 Merge branch 'maint-0.4.5' into release-0.4.5 changes/bug40285_045 | 4 ++++ src/core/or/circuitbuild.c | 18 +++++++++++++----- src/core/or/circuitlist.h | 3 ++- src/core/or/origin_circuit_st.h | 12 ++++++++++++ src/feature/control/control_cmd.c | 1 + 5 files changed, 32 insertions(+), 6 deletions(-)