[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug6364'

[nickm at torproject.org]

commit b3b4f319367e1fb50ea99ba042ed60030e909c12
Merge: 6f7dbd3 734b090
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 27 09:53:37 2012 -0400

    Merge remote-tracking branch 'linus/bug6364'

 changes/bug6364        |    3 +++
 src/or/command.c       |   14 +++++++++-----
 src/or/connection_or.c |    9 ++++++++-
 3 files changed, 20 insertions(+), 6 deletions(-)