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

[nickm at torproject.org]

commit 2fb27d61e7f58d2f572733c5908949460b89f17e
Merge: c7b6ed1d8 f229c4e66
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 7 14:40:34 2018 -0500

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