Merge branch 'ticket30924_042_04_squashed' into ticket30924_042_04_squashed_merged

diff --cc scripts/maint/practracker/exceptions.txt
Simple merge

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

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

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

diff --cc src/feature/nodelist/nodelist.c
Simple merge

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