[tor-commits] [tor/master] Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5

[nickm at torproject.org]

commit aea2b0446785b76d09bb1a615acc2d0976a87c0d
Merge: c60f3ea60 368aeaadf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 7 11:16:52 2018 -0500

    Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5

 .appveyor.yml       | 6 ++++++
 changes/ticket28318 | 3 +++
 2 files changed, 9 insertions(+)