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

[nickm at torproject.org]

commit 0539c34c35380231c745dd9701b0884a20ee95d1
Merge: 3e9c86a a6eef61
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 21 10:48:02 2011 -0500

    Merge branch 'bug4360'

 changes/bug4360        |    3 +++
 src/or/command.c       |   48 ++++++++++++++++++++++++------------------------
 src/or/connection_or.c |    8 ++++----
 src/or/connection_or.h |    2 +-
 src/or/or.h            |   12 ++++++------
 5 files changed, 38 insertions(+), 35 deletions(-)