[tor-commits] [tor/master] Merge remote branch 'origin/maint-0.2.2'

commit 737228ed8e81de6619a29bd039d08d959d4164da Merge: 4dde69a c5ffd44 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 15 17:18:29 2011 -0400

Merge remote branch 'origin/maint-0.2.2'

changes/bug2756 | 11 +++++++++++ src/or/connection.c | 2 ++ src/or/connection_edge.c | 17 +++++++++++++++++ src/or/connection_edge.h | 1 + src/or/relay.c | 5 +++-- 5 files changed, 34 insertions(+), 2 deletions(-)