Merge branch 'maint-0.3.5' into maint-0.4.0

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

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

diff --cc src/feature/relay/router.c
Simple merge

diff --cc src/test/test_config.c
Simple merge

diff --cc src/test/test_rebind.py
Simple merge