Merge branch 'bug17150_027_extra' into maint-0.2.8

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

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

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

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

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

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