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

[nickm at torproject.org]

commit 7f2e23e7acc0735e5ae933535a1b617a0860e528
Merge: 00a42277e b39c50cde
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 16:30:12 2018 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "ours" merge to avoid maint-0.3.0's version of 24895.