commit 385a44bac5de14aa0fab0808f5d1516d7cce4d3a Merge: bea47fde5 783e458c0 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 08:59:11 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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