commit 240893451694a19a3cf9ba7ddcaea6bb37581406 Merge: 07a5fd1 7bd4634 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 16 17:30:24 2011 -0500

Merge remote-tracking branch 'sebastian/bug2893'

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