Merge branch 'tor-github/pr/536' into maint-0.3.5

diff --cc src/feature/client/entrynodes.c
Simple merge

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