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

[nickm at torproject.org]

commit 46910c060f6d0065f1745500e2bef89da8f8801a
Merge: d83c299eb 508002a4c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 21 09:50:46 2019 -0500

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