[tor-commits] [tor/master] Merge branch 'ticket30051_take2_squashed'