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

[nickm at torproject.org]

commit 7a343ecec55b47f5ff6dcf5ee61ad6d3e1796475
Merge: 0d5aaef46 05f5f6500
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 10 09:42:22 2018 -0400

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