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