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

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

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

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