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

[nickm at torproject.org]

commit 9583b34a40e6fb1a4ace9aa36a6c7cacc35b0d5f
Merge: bee3a46 b60fb3a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:21:19 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8