Merge branch 'tor-gitlab/mr/326' into maint-0.4.5

diff --cc configure.ac
Simple merge

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

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