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

[nickm at torproject.org]

commit d199519706e13370597a158130ffe5e3a5ddea72
Merge: 0402746a9 52b508735
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 7 10:23:30 2019 -0500

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