Merge remote-tracking branch 'public/bug13698_024_v1'

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

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

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