[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit da65bdd3208015d68eb1273393a5215b07eac0a5
Merge: 955846f bcbb2d1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jan 22 19:04:02 2017 -0500

    Merge branch 'maint-0.2.9'
    
    "ours" merge to avoid taking cherry-picked 20307 fix