commit 00322a9ba97cf5db534b9993e6320f75d348320f Merge: 385a44bac c93ecb818 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 09:06:34 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+)