Merge branch 'bug4647_squashed'

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

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

diff --cc src/or/main.c
Simple merge