[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit 9c2b114b2ee93434106ae300e31ba2ed317baea2
Merge: 8a15d0f69 72c1303ce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 27 12:03:50 2018 -0500

    Merge branch 'maint-0.3.5'

 .appveyor.yml       | 4 ++--
 changes/ticket28574 | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)