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

[nickm at torproject.org]

commit f9636ebc2f70544f8b86eb7e3a86a85c81349f8e
Merge: 5d4ff91 d47c52b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 8 11:03:08 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9
    
    "Ours" merge to avoid bumping version.