commit a99ca9313a501f30588a9bdee4034eec6fa3cf23 Merge: dbd4b2be5 7c59c751b Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)