[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm at torproject.org]

commit cce1a6efa6adbb90566fc6567c82c4410cd76bf9
Merge: 0d4addfc7 38a58076e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 24 09:10:37 2017 -0400

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