Merge remote-tracking branch 'teor/bug8976_01_028'

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

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

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