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

[nickm at torproject.org]

commit 6ce8cc5dbba52c2a5e60d4311e8b9cfe684f210e
Merge: 4edbbee2f 151d5eded
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 25 09:28:41 2017 -0400

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