[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm at torproject.org]

commit 8239af0d9cb3e45e4c5ff04ab057450934e306cf
Merge: b533220 bff08ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:29:12 2017 -0400

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