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

[nickm at torproject.org]

commit 5f8440981aa0cabd5dfda8f0515c4a42e185f5ab
Merge: 9583b34 a9f936d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:30:36 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8