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

[nickm at torproject.org]

commit 43937b9d6485674153c0dc69c39ca6a148de1a1c
Merge: 9ba69be96 1f7f930f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 8 11:39:38 2018 -0500

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