Merge remote-tracking branch 'public/bug6887'

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

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

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

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