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