commit bf1678603ffa66ed47c038faf309984839a98363 Merge: 2f5d7bb f96400d Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 25 16:09:15 2014 -0500

Merge remote-tracking branch 'public/bug10449'

changes/bug10449 | 8 ++++++++ src/or/control.c | 17 ++++------------- 2 files changed, 12 insertions(+), 13 deletions(-)