Merge branch 'mr/334'

changes/bug40222

src/app/config/config.c

src/app/config/or_options_st.h

src/core/mainloop/connection.c

src/core/or/relay.c

src/feature/relay/dns.c

src/feature/relay/onion_queue.c

src/feature/relay/router.c

src/feature/stats/rephist.c

src/feature/stats/rephist.h

src/test/test_stats.c