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

[nickm at torproject.org]

commit eca4a89319c566c0e320c7f713aed0f7e34330eb
Merge: a9f936d 4bce207
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 10:39:13 2017 -0500

    Merge branch 'maint-0.2.7' into maint-0.2.8