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

[nickm at torproject.org]

commit 0e5e5ba64bab49d056814bc933ab3c4c0a0f5a74
Merge: 868de69 06fe8a1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 5 10:04:42 2017 -0400

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