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

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

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