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

[nickm at torproject.org]

commit 9b19e33bedcdd107d0599ab795cccfc2d7cb93dc
Merge: f406b9df0 1cf11b694
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 10:17:33 2018 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "ours" merge to avoid 0.2.5 version of #24863 fix.