Merge remote branch 'origin/maint-0.2.2'

changes/bug2756

src/or/connection.c

src/or/connection_edge.c

src/or/connection_edge.h

src/or/relay.c