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

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

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

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

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