[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm at torproject.org]

commit e0903ebd88a47a03a5e432e1a6c98452ae8a9008
Merge: f7eff2f8c 1ec386561
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 1 16:43:42 2018 -0500

    Merge branch 'maint-0.3.2' into maint-0.3.3
    
    "ours" to avoid version bump.