Merge remote-tracking branch 'arma/bug1992'

changes/bug1992

src/or/config.c

src/or/config.h

src/or/main.c

src/or/router.c

src/or/routerlist.c