Merge remote-tracking branch 'origin/maint-0.2.3'

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/control.c
Simple merge

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

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