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

[nickm at torproject.org]

commit a56cfdaba20683562e5793d6bded58a591afb04c
Merge: 9ea3d08 2e5220c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 14:39:06 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6
    
    Ours merge to avoid taking 4ee48cb434c46d9e4c477dabd8a97f03e3db221d