[tor-commits] [tor/master] Merge branch 'bug4424' into maint-0.2.2