Merge remote-tracking branch 'catalyst-github/bug25756'

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

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

diff --cc src/or/networkstatus.h
Simple merge