[tor-commits] [tor/master] Merge branch 'bug6490_v2' into maint-0.2.3