Merge branch 'ticket32883'

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

diff --cc src/app/main/ntmain.c
Simple merge

diff --cc src/app/main/ntmain.h
Simple merge

diff --cc src/feature/api/tor_api_internal.h
Simple merge