Merge branch 'maint-0.3.0' into maint-0.3.1

diff --cc src/or/entrynodes.c
Simple merge

diff --cc src/or/entrynodes.h
Simple merge

diff --cc src/or/nodelist.c
Simple merge

diff --cc src/or/nodelist.h
Simple merge

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