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

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

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

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

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