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

commit c165cb7f57c6af842c5f1c117a99da8b5a3d50d7 Merge: f90c05337 a8bab72c3 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 6 08:29:44 2018 -0400 Merge branch 'maint-0.3.4' "ours" to avoid version bump.