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

[nickm at torproject.org]

commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25
Merge: 5325e7cca 552b62028
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 24 09:11:24 2017 -0400

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