[tor-commits] [tor/master] Merge branch 'bug30021_029' into bug30021_035