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

Merge branch 'maint-0.3.0' into maint-0.3.1

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