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

[nickm at torproject.org]

commit 7fae562a4da62090817f8546e8f4a8a29dcf1c4a
Merge: a12dbbd88 6e3ec8222
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 09:35:25 2017 -0500

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