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