[tor-commits] [tor/master] Merge branch 'ticket27252-029' into ticket27252-032