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

[nickm at torproject.org]

commit 31e7b47fbebe8cafd9dc1c930cc85585116cdc0f
Merge: ba5f3d5 9c899da
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 8 09:07:41 2016 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8