Merge remote-tracking branch 'tor-gitlab/mr/338'

diff --cc doc/man/tor.1.txt
Simple merge

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

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

diff --cc src/feature/relay/router.c
Simple merge

diff --cc src/feature/stats/bwhist.c
Simple merge

diff --cc src/feature/stats/bwhist.h
Simple merge

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