Merge branch 'bug28591_035_squashed'

changes/bug28591

changes/bug28654

src/core/mainloop/mainloop.c

src/feature/dircache/dircache.c

src/feature/nodelist/microdesc.c

src/feature/nodelist/networkstatus.c

src/feature/nodelist/networkstatus.h

src/test/test_entrynodes.c

src/test/test_routerlist.c