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