Merge branch 'maint-0.2.1'

ChangeLog

src/or/circuitbuild.c

src/or/circuituse.c

src/or/directory.c

src/or/main.c

src/or/router.c