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

[nickm at torproject.org]

commit c1bdc3b10e66de6d79c48c94628956b8578d5f17
Merge: 0e5cf4a 66c85cd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:57:05 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    This is an "ours" commit to avoid taking the fix for 22838,
    which we already have here.