commit 29825f0bfd301185744d6961c1b62b9597d165d6 Merge: 169c818 9df99bb Author: Nick Mathewson <nickm@torproject.org> Date: Thu Oct 20 14:26:54 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug4091' src/or/config.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)