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

[nickm at torproject.org]

commit e507751b9beb4ddabdda2d612387ab9edd58dac1
Merge: b214c2c d1340bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 18 12:28:48 2017 -0400

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