Merge branch 'maint-0.4.8'

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/core/or/relay.c
Simple merge