Merge commit 'origin/maint-0.2.1'

diff --cc ChangeLog
Simple merge

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

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

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

diff --cc src/or/or.h
Simple merge