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

[nickm at torproject.org]

commit 805a785780c2f3abccf080caddc345ca8f484797
Merge: d4a758e08 35753c077
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 1 16:42:25 2018 -0500

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