Merge branch 'maint-0.2.1'

diff --cc ChangeLog
Simple merge

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

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

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

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

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