[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug5646'

[nickm at torproject.org]

commit c1da29e22d138bb30b6ade452aa0e0321330efe3
Merge: a8a862c 153b989
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 18 12:10:40 2012 -0400

    Merge remote-tracking branch 'asn/bug5646'

 src/or/command.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)