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

[nickm at torproject.org]

commit 586c327e072ec5a85fcb93cc64e703e201251eb2
Merge: 0e85b7106 23c5259a3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 14:40:43 2017 -0400

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