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

[nickm at torproject.org]

commit f42c3cfe2e3568bea0d521c972e252ba2dcf4188
Merge: 5065a6850 942c2da48
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 16 11:32:10 2018 -0500

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