commit 467c882baa9f08e46428319cea67f57bb4287730 Merge: 037fb0c80 4aaa4215e Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 12 12:25:51 2018 -0400 Merge branch 'maint-0.3.3' src/or/config.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)