Merge remote-tracking branch 'arma/bug7029'

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

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

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

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