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

[nickm at torproject.org]

commit 6e3ec8222c6b2b3eec332ef3b5d3b0eac0c00ce5
Merge: 1983068ba 495db72c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 09:35:16 2017 -0500

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