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

[nickm at torproject.org]

commit 3e5b1c2d95d2270d2e7b9e137c5ec04e0e534659
Merge: 946661d b60fb3a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:20:52 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9