commit 866a2828bdcb88398ee8332e918e9a9028397156 Merge: 5580fbb 2e34416 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 14 17:20:01 2011 -0400

Merge branch 'bug3577' into maint-0.2.2

changes/bug3577 | 4 ++++ src/or/control.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-)