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