[tor-commits] [tor/release-0.4.2] Merge branch 'ticket32629_040' into ticket32629_041