Merge remote-tracking branch 'tor-github/pr/536'

diff --cc src/feature/nodelist/microdesc.c
Simple merge

diff --cc src/feature/nodelist/networkstatus.c
Simple merge

diff --cc src/feature/nodelist/networkstatus.h
Simple merge

diff --cc src/test/test_entrynodes.c
Simple merge