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

[nickm at torproject.org]

commit 1fb3d37c08be1c1e9501990d1762c0fbb1f9388d
Merge: 8441189b3 93b3c4b84
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 13 12:06:43 2017 -0500

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