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

[nickm at torproject.org]

commit 3930ffdf63425c344e14c45cff6780108cfa038b
Merge: d21e5cfc2 2b99350ca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 16 08:47:12 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.1
    
    "ours" merge to avoid conflicts with the cherry-picked fix for 24898.