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

[nickm at torproject.org]

commit b796ad0300d1b023bc38e5a1498b47bc2e680eae
Merge: 0de4620 77c5d8c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:28:29 2017 -0400

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