[tor-commits] [tor/master] Merge branch 'bug34077_042' into bug34077_043