[tor-commits] [tor/master] Merge branch 'ticket29040_1_changes' into maint-0.3.5