commit 11abdccc752a1caf5c522deb589231c6b5557e33 Merge: 2fee12a96 23e3d57e1 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 09:06:34 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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