Merge remote-tracking branch 'public/bug8387_024' into maint-0.2.5

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

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

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