Merge remote-tracking branch 'asn/bug11069_take2'

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

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

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