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

[nickm at torproject.org]

commit c9009ccf92d9a759d9135bcf872640f769f93a00
Merge: de65647 b838e1f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 19 08:07:56 2016 -0500

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