[tor-commits] [tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/333' into maint-0.4.5

[asn at torproject.org]

commit 59bbf8cde9144ee5c8d060959e723a4bedfd6bb8
Merge: d66178c7b7 9409c7f2f5
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Mar 17 13:43:38 2021 +0200

    Merge remote-tracking branch 'tor-gitlab/mr/333' into 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(-)