Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

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

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