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

[nickm at torproject.org]

commit e468498469ebb2a676e74884a34fa017fa8ac3a4
Merge: 348b225bd f7b06202c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 14 13:21:52 2017 -0400

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