Merge remote-tracking branch 'public/no_dup_guards' into maint-0.2.4

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

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

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

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