[tor-commits] [tor/master] Merge branch 'ticket28973_033_squashed' into maint-0.3.3