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

[nickm at torproject.org]

commit 38a58076e921d561fa1e488a4b0f983b12300ca4
Merge: cbb41ddfe 302b5f577
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 24 09:10:30 2017 -0400

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