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

[nickm at torproject.org]

commit 29784d80faab3d8307916c7a945e89fe082e3db0
Merge: 83a734324 34c6034aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 9 10:12:43 2018 -0500

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