Merge branch 'maint-0.3.5' into maint-0.4.3

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

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

diff --cc src/feature/client/entrynodes.c
Simple merge

diff --cc src/feature/rend/rendclient.c
Simple merge