commit 84b2197571b847b9100b300ee596f371547b0301 Merge: 79b40a910 36c323553 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 27 12:03:50 2018 -0500 Merge branch 'maint-0.3.4' into release-0.3.4 .appveyor.yml | 4 ++-- changes/ticket28574 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)