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

[nickm at torproject.org]

commit 131ab9d5233a2f452c608bf85a39255903d036c1
Merge: 289a7dbac fd6078b33
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 23 19:54:04 2018 -0400

    Merge branch 'maint-0.3.4' into maint-0.3.5
    
    "ours" version to avoid removing rust use declaration.