commit 783e458c07be5f3f3539b1420e2a51f8b4efe04a Merge: 74e8fd22c c958fda6e Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 08:59:11 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

changes/longclaw_23592 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)