commit 0ac03390e482a7ff1008f0051ac647114ce00c09 Merge: 36b54fc6aa 59bbf8cde9 Author: George Kadianakis desnacked@riseup.net Date: Wed Mar 17 13:43:48 2021 +0200

Merge branch 'maint-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(-)