[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.4' into maint-0.2.5

[nickm at torproject.org]

commit b2b604ecb4df95526a309c9ff507dff942472daa
Merge: aeb299b 4bab288
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 28 10:22:36 2017 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5
    
    "ours" merge to avoid bumping version