Merge branch 'bug23817_031' into maint-0.3.2

changes/bug23817

src/or/directory.c

src/or/directory.h

src/or/entrynodes.c

src/or/entrynodes.h

src/or/microdesc.c

src/or/microdesc.h

src/or/networkstatus.c