Merge remote branch 'origin/maint-0.2.2'

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

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

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

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