[tor-commits] [tor/master] Merge branch 'bug3367'

[nickm at torproject.org]

commit 64a5a4177f905971d0cf9e28a19180c2ea32b02a
Merge: 4186b13 e617a34
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 21 11:32:52 2011 -0400

    Merge branch 'bug3367'

 changes/bug3367     |    4 ++++
 src/or/connection.c |   19 +++++++++++++++++++
 src/or/connection.h |    2 ++
 src/or/control.c    |    4 ++--
 4 files changed, 27 insertions(+), 2 deletions(-)