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

[nickm at torproject.org]

commit 71248800f72e8ca438f4c61d2c3715258a1b986a
Merge: 9c294d29e 4f7955d5d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 14:38:57 2017 -0400

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