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

[nickm at torproject.org]

commit e1079266e73c70cc0e5141249ebf3199a849017d
Merge: 4a8a1f76e a56b9501f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 21 13:23:52 2019 -0500

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