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

[nickm at torproject.org]

commit 27c3a1d65740bd1fe85d7fb0cd401708dcf3a457
Merge: 9a14f1ef6 aec505a31
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 3 11:34:02 2018 -0500

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