Merge branch 'maint-0.4.8'

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

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

diff --cc src/core/or/circuitlist.c
Simple merge

diff --cc src/core/or/circuituse.c
Simple merge

diff --cc src/feature/dirauth/process_descs.c
Simple merge

diff --cc src/feature/dirauth/voteflags.c
Simple merge

diff --cc src/feature/hs/hs_service.c
Simple merge

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

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