[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

[nickm at torproject.org]

commit 1174b50cab48be08b321deced0cfa022160d2c40
Merge: aec45bc 57e778f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 28 10:26:45 2017 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7-redux
    
    "ours" merge to avoid version bumps