Merge branch 'tor-gitlab/mr/275'

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

diff --cc src/app/config/or_options_st.h
Simple merge

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

diff --cc src/feature/nodelist/routerlist.h
Simple merge