commit c958fda6e29265b12b987ee8445873c25629ae71 Merge: 132e2f69b 9a1b38546 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 08:59:11 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

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