commit 009141c6a8b282b22bc9ee2fc0bf9fd9eb8ce867 Merge: b8dedaee7 23e3d57e1 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 09:06:34 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

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