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

[nickm at torproject.org]

commit 5d37d270075ba64d08d95eb0d5cc0d3473acbdbb
Merge: 7a4741c23 d29e4c059
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 08:46:29 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1