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

[nickm at torproject.org]

commit bae96cf1dcab085f26bde7bfe67bd4e69ba3f5fb
Merge: a46288252 9120ac221
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 08:47:59 2017 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2