Merge remote-tracking branch 'asn/bug23862_v2'

changes/bug23682

src/or/directory.c

src/or/directory.h

src/or/entrynodes.c

src/or/entrynodes.h

src/or/networkstatus.c

src/test/test_routerlist.c