[tor-commits] [tor/master] Merge branch 'bug2756_relay' into maint-0.2.2

[nickm at torproject.org]

commit c5ffd44ccd3c60780143eb384938276522a173c1
Merge: ab41844 a86e27c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 15 17:13:07 2011 -0400

    Merge branch 'bug2756_relay' into 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(-)