Merge bug5595-v2-squashed into maint-0.2.4

changes/bug5595

src/or/Makefile.nmake

src/or/directory.c

src/or/dirvote.c

src/or/fp_pair.c

src/or/fp_pair.h

src/or/include.am

src/or/router.c

src/or/routerlist.c

src/or/routerlist.h

src/test/test_containers.c