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

[nickm at torproject.org]

commit 1fd6e25522ed064e8043f4548fbd33fca9246295
Merge: 7e2b012b4 6ee447254
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 30 12:22:38 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9
    
    "ours" merge to avoid version bump.