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

[nickm at torproject.org]

commit 5e8cf876e7fb6a742a8d188c4d29baaeab2f63fe
Merge: e48d3e6f8 2e9e91ebb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 29 11:24:13 2018 -0400

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