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

[nickm at torproject.org]

commit 50ad2545ccbec62f922306609384d78b781e4258
Merge: a23c36ebc 48182c147
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 10 14:27:27 2018 -0400

    Merge branch 'maint-0.3.4'

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