[tor-commits] [tor/release-0.3.3] Merge branch 'trove-2018-005_032' into maint-0.3.3