Merge remote-tracking branch 'asn/bug12207_second_draft'

src/or/entrynodes.c

src/or/entrynodes.h

src/or/routerlist.c

src/or/routerlist.h

src/test/include.am

src/test/test.c

src/test/test_descriptors.txt

src/test/test_entrynodes.c