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

[nickm at torproject.org]

commit afee785417cba083c4914fd9b6db49498c2eb241
Merge: 9320100d6 532873a92
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:24:14 2018 -0400

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