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

[nickm at torproject.org]

commit 61c13936015493a5b7224887b6a319db761f9983
Merge: 5b3a7c7c0 b74ed31f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:22:13 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4