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

[nickm at torproject.org]

commit f93bcab60e09618bf5b9ec55c6f4f338f2a7cd06
Merge: f2a657c b5526be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 28 10:37:25 2017 -0500

    Merge branch 'maint-0.2.7-redux' into maint-0.2.8
    
    This is an "ours" merge to avoid taking a version bump, and to
    avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto maint-0.2.8, which already included the relevant changes.