commit a72b1815e83fcd7d24731b9a41f956267e8780fc Merge: cb24a06 e5e7b6d Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 8 10:05:41 2011 -0400

Merge remote-tracking branch 'public/bug3550'

changes/bug3550 | 5 +++++ src/or/config.c | 11 +++++++++-- src/or/main.c | 7 +++++++ 3 files changed, 21 insertions(+), 2 deletions(-)