[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm at torproject.org]

commit 274de0e2bcffecea1c2d3bacefef13547a006974
Merge: e7126a103 7c2f688fb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 25 09:28:57 2017 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2
    
    "ours" merge to avoid version bump