commit 43f95e38abefced37ad24966d56298e972cebf81 Merge: df4693f 528e3bf Author: Nick Mathewson <nickm@torproject.org> Date: Thu Oct 10 11:27:28 2013 -0400 Merge remote-tracking branch 'sysrqb/bug9950' src/or/confparse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)