[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug4367'

[nickm at torproject.org]

commit 4af82fb3886e8be25ba83a1f93da54bf0d5d7974
Merge: 8592126 325a659
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 14 22:35:49 2011 -0500

    Merge remote-tracking branch 'public/bug4367'

 changes/bug4367  |    5 +++++
 changes/bug4368  |    4 ++++
 src/or/command.c |   25 +++++++++++++++++--------
 3 files changed, 26 insertions(+), 8 deletions(-)