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

[nickm at torproject.org]

commit 026882fa3d718246153ba91150a43e7ad8a4bdfc
Merge: 61ceb2622 bf91b6e05
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:24:09 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1