Merge branch 'maint-0.3.5' into maint-0.4.0

changes/bug30916

changes/bug31107

changes/bug31408

changes/bug31837

changes/ticket31466

src/core/or/channeltls.c

src/core/or/connection_edge.c

src/feature/relay/router.c

src/lib/fs/conffile.c

src/test/test_config.c

src/test/test_rebind.py