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

[nickm at torproject.org]

commit c02646b8f0318b93eeb41306d53c5037a30edd53
Merge: 0691fed 7b24f3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 08:41:41 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8