[tor-commits] [tor/master] Merge branch 'mr_347_squashed' into maint-0.4.6