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

[nickm at torproject.org]

commit 4bcec3bab5b0f93934bfe67093146c7a77fa724f
Merge: 2042080 e718a58
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 15 12:55:54 2016 -0400

    Merge branch 'maint-0.2.8'
    
    'ours' merge to avoid bumping version.