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