[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1376'

[nickm at torproject.org]

commit 05a324b56450e9c0753e6498a3d5c278659140ab
Merge: 5fd137c48 b18641879
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 3 09:19:37 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1376'

 .appveyor.yml    | 12 ++++++++++++
 changes/bug31884 |  3 +++
 2 files changed, 15 insertions(+)