commit 15a7e24dcd7abd9c7e0a4721522d8513a00348e1 Merge: 2f9032f1c 9a1b38546 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/longclaw_23592 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)