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

[nickm at torproject.org]

commit c41944d06aaba7899ff3e2bb1a97f859e849d2eb
Merge: a7a900685 0ea622aa3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 29 11:17:31 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 Makefile.am      | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)