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

[nickm at torproject.org]

commit 740b8bb79c6d4ca6bf5c860c319b71fb81840334
Merge: a78957888 074b182ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 12:40:40 2018 -0400

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