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

[nickm at torproject.org]

commit 9b88254d1e393c92bfa3c9dc47e4049b66cf7844
Merge: a546487 8324631
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 15 18:25:31 2017 -0400

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