Merge branch 'bug7582_v2' into maint-0.2.4

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

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

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

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