commit 3205700bc42bd3350defc569709b562a6adff0fd Merge: 8c2ccf937 911e2dc53 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 28 09:50:26 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23053 | 5 +++++ src/or/config.c | 1 + 2 files changed, 6 insertions(+)