Merge remote-tracking branch 'asn/bug4865_take2'

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

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

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