commit 8611195a005ed1624bdea0632404a8c00bb19586 Merge: 8bf2892 940cef3 Author: Nick Mathewson nickm@torproject.org Date: Sun Aug 25 00:32:27 2013 -0400

Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3

changes/bug9546 | 11 +++++++++++ src/or/command.c | 14 ++++++++++++-- src/or/connection_or.c | 9 ++++++++- src/or/or.h | 3 +++ 4 files changed, 34 insertions(+), 3 deletions(-)