commit abbd6a36fc65378248548a1276f31dd1bb1a6906 Merge: f7707c903 0d4addfc7 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 24 08:25:29 2017 -0400 Merge branch 'maint-0.3.2' changes/bug23952 | 4 ++++ src/or/config.c | 22 ++++++++++++++++++++++ src/or/config.h | 1 + src/or/or.h | 4 ++-- 4 files changed, 29 insertions(+), 2 deletions(-)