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

[nickm at torproject.org]

commit ffad41e9d8698aa0111f76fe3c81be1da6b985d6
Merge: f4e1887 6ec3228
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 3 09:38:27 2017 -0400

    Merge branch 'maint-0.3.0'
    
    ("Ours" merge to avoid version bump.)