Merge remote-tracking branch 'teor/bug18348-v2'

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

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

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