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

[nickm at torproject.org]

commit 06f3526b03a7a9462f26515ae7c2dde2b283a3fb
Merge: ed2dbd51e cf0597c3b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 26 09:12:28 2018 -0400

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