commit 911e2dc5308d4cbd3f2c7e78e38055cb36c908fb Merge: af3079a49 9a0f38a34 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 28 09:50:16 2017 -0400 Merge branch 'bug23053_029' into maint-0.3.1 changes/bug23053 | 5 +++++ src/or/config.c | 1 + 2 files changed, 6 insertions(+)