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