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