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

[nickm at torproject.org]

commit b9103c38c367807d4ca03bae4f707febfad2cfce
Merge: 859d744eb fa38bbb70
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 09:49:41 2018 -0400

    Merge branch 'maint-0.3.4'
    
    "ours" to avoid version bump