commit a9820f072bf1bd796651e9e3913988e6224bd524 Merge: 0489288aa 9da8cd0bc Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 20 13:10:38 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

.appveyor.yml | 4 +++- changes/ticket28459 | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-)