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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.4'

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