[tor-commits] [tor/release-0.4.0] Merge branch 'bug29693_040_radical_squashed' into maint-0.4.0