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

[nickm at torproject.org]

commit 4ef6e1d440c2788ba0beea266c7dc9bea3c010d4
Merge: 8e3bae566 6560346a4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 8 09:01:08 2018 -0500

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