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

[nickm at torproject.org]

commit a2038b8d9e47bc123da6896268a21e8f2501b8ec
Merge: 517032b8c 5da6120e8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 21 12:54:26 2017 -0500

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