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

[nickm at torproject.org]

commit 91e82baa8d82e147e490922d5447596cdc621054
Merge: c6c4a421f c7d1d1ad2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 7 13:22:37 2017 -0500

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