Merge remote-tracking branch 'rransom-tor/bug1297b-v2'

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

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

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