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

[nickm at torproject.org]

commit 6b2c88649ddb9496d6ae738d2c08436304fed0ea
Merge: c239b2f e84127d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 28 13:49:14 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "Ours" merge to avoid taking backport of 21969