[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033