Merge branch 'maint-0.4.5'

diff --cc src/core/or/circuitbuild.c
Simple merge

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

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

diff --cc src/feature/control/control_cmd.c
Simple merge