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

[nickm at torproject.org]

commit 1243c1000cdcfd4edf414ff8a14e34ea15aa2cef
Merge: 5f84409 eca4a89
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 10:39:56 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8