[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025