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

[nickm at torproject.org]

commit 4915d9c5a7fc8db2497258a293137426cbd0d665
Merge: 2efe027 b796ad0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:28:54 2017 -0400

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