Merge branch 'maint-0.3.5' into maint-0.4.3

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