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

[nickm at torproject.org]

commit b74ed31f90ec43a7666cf622a6547d6d670e1692
Merge: 75d9db9e5 a95cfb8a5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:21:46 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4
    
    "ours" merge to avoid cherry-picked copy of #25512 fix, which is already in
    this branch.