[tor-commits] [tor/master] Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4

[nickm at torproject.org]

commit 48182c147b03dcf4ebdac607a3ce6606ab287668
Merge: e5fe8b0e3 c6b5b43d9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 10 14:27:24 2018 -0400

    Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4

 .appveyor.yml               | 150 ++++++++++++++++++++++----------------------
 changes/tickets_27765_27943 |   5 ++
 2 files changed, 81 insertions(+), 74 deletions(-)