Merge branch 'mr/334'

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

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

diff --cc src/core/mainloop/connection.c
Simple merge

diff --cc src/core/or/relay.c
Simple merge

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

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

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

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

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

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