[tor-commits] [tor/master] Merge branch 'teor_bug21357-v2_029'