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

[nickm at torproject.org]

commit 47859e11e505cd6c2437fb8006de44297b6b9d2f
Merge: 790062d72 afee78541
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:24:37 2018 -0400

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