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

Conflicts:
	src/or/circuituse.c

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

diff --cc src/or/or.h
Simple merge

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