Merge remote-tracking branch 'public/bug9841_025'

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

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

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

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

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