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

[nickm at torproject.org]

commit 909c91049a424776c563363312f93dcdc4cdb241
Merge: 998a24712 7fae562a4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 09:35:31 2017 -0500

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