commit 0a3dfd0423e230bf5b29c21623480af777bb22c1 Merge: b1971d8 e50fa0d Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 4 12:46:33 2012 -0400

Merge remote-tracking branch 'arma/bug7037' into maint-0.2.3

changes/bug7037 | 6 ++++++ src/or/command.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)