Merge remote-tracking branch 'teor/bug18050' into maint-0.2.7

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

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