[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

[nickm at torproject.org]

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de
Merge: d4befa035 743eee493
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 24 09:10:04 2017 -0400

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