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

[nickm at torproject.org]

commit 306098f851e936ab253f4ef3b815d4e9bf23eca7
Merge: be88f12b7 c9906cc3f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 16 08:28:59 2018 -0500

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