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

[nickm at torproject.org]

commit a38dfc7f29392b919c1a1d9ddb6075eec311d9c3
Merge: 8c1c71a 0a74346
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 26 12:30:03 2016 -0400

    Merge branch 'maint-0.2.8'
    
    (Ours merge, to avoid taking version bump)