Merge remote-tracking branch 'origin/maint-0.2.2'

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

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

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

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

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

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