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

[nickm at torproject.org]

commit 8da7fcccd67f5dc37acc904f628d94fb2827059d
Merge: a8482d127 3ee4c9b1f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Apr 15 15:41:10 2018 -0400

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