commit 5e1bad325965c4f91433dfbe46f4d3c268327d4e Merge: 533ae56fc 15a699462 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 09:03:58 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

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