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

[nickm at torproject.org]

commit af5454e01c5dd231a9dba6579e3c2ceb26d248e2
Merge: ecc84d878 5d37d2700
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 08:46:29 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1