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

[nickm at torproject.org]

commit 85cee6a749128b926cd727a5c0f2e516a260eb41
Merge: b36f128ce 967cef2f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 08:48:23 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 .appveyor.yml    | 4 +++-
 changes/bug27460 | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)