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

[nickm at torproject.org]

commit e185cac6f6e39cda906a206abac4b0c5d04ba0fa
Merge: 5b1f33076 ff27b7ce6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 18:05:42 2018 -0400

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