commit 2fee12a96aa8fd09872d04da05e8bcc86dbe16d1 Merge: 919286be0 df57d1e0c Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 08:59:11 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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