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

[nickm at torproject.org]

commit 6f1fe29e8de32e3651d92a296fbc81e50f5e740c
Merge: d22963938 15f6201a5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 1 16:44:18 2018 -0500

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