Merge branch 'maint-0.2.7'

changes/bug17668

changes/bug17702

changes/bug18318_ed

changes/bug18368

src/or/dircollate.c

src/or/dircollate.h

src/or/dirserv.c

src/or/dirserv.h

src/or/dirvote.c

src/or/dirvote.h

src/or/networkstatus.c

src/or/or.h

src/or/routerparse.c