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

[nickm at torproject.org]

commit bff08ed8eb4f9c36d32ae5e15bd574052cca8d78
Merge: 792931d 4915d9c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:29:05 2017 -0400

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