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

[nickm at torproject.org]

commit 302b5f577dc0840fd9f738d160ef14b88a71b67f
Merge: d913a7317 725f23710
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 24 09:10:24 2017 -0400

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