[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4