Merge branch 'maint-0.3.2'

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

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

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