commit 14552a12b3b6ff0770153d9d2f116febad349303 Merge: 6a06f45 6650dc9 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Aug 17 10:46:28 2011 -0400 Merge branch 'bug3743' src/or/config.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)