[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3