Merge branch 'bug5604'

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

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

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