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