Merge branch 'maint-0.3.5' into maint-0.4.0

diff --cc src/app/config/config.c
Simple merge

diff --cc src/core/mainloop/connection.c
Simple merge

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

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

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