Merge remote-tracking branch 'public/bug11243_squashed'

changes/ticket11243

scripts/codegen/makedesc.py

src/or/directory.c

src/or/dirserv.c

src/or/dirvote.c

src/or/microdesc.c

src/or/networkstatus.c

src/or/networkstatus.h

src/or/or.h

src/or/router.c

src/or/routerlist.c

src/or/routerlist.h

src/or/routerparse.c

src/or/routerparse.h

src/test/example_extrainfo.inc

src/test/failing_routerdescs.inc

src/test/include.am

src/test/test_dir.c

src/test/test_microdesc.c