Merge branch 'maint-0.4.0' into maint-0.4.1

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

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

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

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

diff --cc src/feature/hs/hs_client.c
Simple merge

diff --cc src/feature/hs/hs_service.c
Simple merge