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

[nickm at torproject.org]

commit 5ff31ff5b34fd69383b366d38e997822f0442086
Merge: f2ca22f 7549259
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 1 08:19:23 2017 -0500

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