Merge remote-tracking branch 'public/bug6174' into maint-0.2.4

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

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

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

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

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

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

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

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