Merge remote-tracking branch 'mikeperry/bug23114_squashed2'

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

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

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

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

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

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

diff --cc src/test/include.am
Simple merge

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

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