Merge remote-tracking branch 'public/bug11243_squashed'

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

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

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

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

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