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

Conflicts:
	src/or/routerparse.c

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

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

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

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