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

diff --cc src/common/compat.c
Simple merge

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

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