[tor-commits] [tor/master] Merge branch 'bug30894_035' into ticket30893