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

[nickm at torproject.org]

commit 830b7b31b5d7a39f3838d87c0432035d0d9e4245
Merge: 71248800f 8925e84be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 2 12:28:43 2017 -0400

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