Merge commit 'origin/maint-0.2.1'

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

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

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

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