Merge branch 'maint-0.2.2'

diff --cc src/common/util.c
Simple merge

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

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

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