Merge branch 'maint-0.2.1' into master

ChangeLog

debian/changelog

doc/spec/tor-spec.txt

src/or/command.c

src/or/config.c

src/or/cpuworker.c

src/or/or.h

src/or/relay.c

src/or/router.c

src/win32/orconfig.h