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

[nickm at torproject.org]

commit a9f936d0d757c5628a8da0b88af4710b2f6d22fd
Merge: b60fb3a 86d5a6f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:30:10 2017 -0500

    Merge branch 'maint-0.2.7' into maint-0.2.8