commit c93ecb8189773e06fa3635fff8184024c6c6e0fa Merge: 783e458c0 1db5081ba Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+)