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

[nickm at torproject.org]

commit 8b8d501040946bb2280a9640f91a55b7f17b03e3
Merge: 6a7aa4735 af33fdd7c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 09:22:43 2017 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2
    
    "ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9