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

[nickm at torproject.org]

commit 151d5ededf9fb334a5195904945f95cf626f51bc
Merge: 46091a88c faf568fa7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 25 09:28:29 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9
    
    "ours" merge to avoid version bump