commit f6005170891e4fb649c6ddcd0fd7800b2902861f Merge: 49e243f88 a9820f072 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 20 13:10:38 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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