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

[nickm at torproject.org]

commit df70c44960aec3abc617b4d395bf5443c543cedc
Merge: 506264791 fb309f6eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 21 13:23:22 2019 -0500

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