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

[nickm at torproject.org]

commit 1afdb5b6cc1d07d49d5c8f369e1493dd844acad9
Merge: add00045a 569b4e57e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 12:33:09 2018 -0400

    Merge branch 'maint-0.3.3'
    
    "Ours" merge to avoid the maint-0.3.3 version of the TROVE-2018-005
    fix, which touches the files in their old locations.