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

[nickm at torproject.org]

commit 875b1fbfba7bd4b1246c3d97b846e1ff77d0535a
Merge: 5e55421 6e90d75
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 14:06:28 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9