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

[nickm at torproject.org]

commit 4f4d3de80c6de40dc4c7face055ec6d3abf3ed27
Merge: 6e7551c ddfb877
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 14:06:49 2017 -0400

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