commit 80a22f536a96de45441cd55874634766b10aa311 Merge: 767372f6a 5bb4e0c88 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 12 09:24:54 2017 -0400 Merge branch 'bug23479' src/or/config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)