commit 4b37c2d1dc398d8229b6ab200fe4c3e27006f017 Merge: 3153c2726 72c1303ce Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 27 12:03:50 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 .appveyor.yml | 4 ++-- changes/ticket28574 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)