Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5

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

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

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