commit 533ae56fcf57e8120549f6026677923fc66e9e26 Merge: 558eafe56 5d219ecf9 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 08:57:22 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

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