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

commit bbee2b62c04e708bfda1419e856f6810825c020b Merge: d972a8a94 59812789f Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 10 08:03:43 2018 -0400 Merge branch 'maint-0.3.3'