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

[nickm at torproject.org]

commit d3da077019740afae040e74fcaa033d0699f8a4b
Merge: cd14f9811 bf71dce01
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 13:34:01 2018 -0500

    Merge branch 'maint-0.3.5'
    
    "ours" merge to avoid version bump