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

[nickm at torproject.org]

commit c4804bb280f16a484d9d5d1ed4aae8bc1614cfce
Merge: a0f8c0100 fb8852719
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 27 08:59:19 2017 -0400

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