[tor-commits] [tor/master] Merge branch 'bug26121-033-squashed' into maint-0.3.3