Merge branch 'bug14084'

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

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

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

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