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

[nickm at torproject.org]

commit 82bd2af78df57206bdcc81e7343a78b7f07c4a1b
Merge: 52cb1ed 9157405
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 1 13:35:34 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9