commit b1445b19e432ec87ea5092366b4e4fbbd5bf5c9b Merge: d818f1e86 c958fda6e Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 08:59:11 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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