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

[nickm at torproject.org]

commit 34083f00aba63f00577bf8612e945affc5409270
Merge: 075fcb599 571cb2f66
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 15 12:20:57 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/bug27081 | 4 ++++
 configure.ac     | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)