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

[nickm at torproject.org]

commit b13fe14cb0fca9f747ca4f83fbde3e5cc3fa0576
Merge: 73aae608d f2e7570c7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 08:57:25 2018 -0400

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