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

[nickm at torproject.org]

commit 35d945a646b3384640d3863aec07d873179efffd
Merge: 15f6201a5 0026d1a67
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 3 11:33:33 2018 -0500

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