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

[nickm at torproject.org]

commit e03a6369cf47814eaee2ec39f7041ef50bb505f0
Merge: 7556636ac c8859582a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 8 16:45:03 2017 -0500

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