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

[nickm at torproject.org]

commit 2f6be06f6a0a563bc07c089bf498b1d3792ae01f
Merge: 44c8cb9 eb92d11
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 14:06:06 2017 -0400

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