commit 711e4b423714de93abff03c4cf740f19f4d4c630 Merge: a5a8296 2f0c0f9 Author: Nick Mathewson nickm@torproject.org Date: Wed May 30 13:05:15 2012 -0400

Merge remote-tracking branch 'linus/bug4369'

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